June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3600 - in branches/maeste_palin/integration/sunri: src/main/java/org/jboss/wsf/stack/sunri/log and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-06-15 12:27:34 -0400 (Fri, 15 Jun 2007) New Revision: 3600 Modified: branches/maeste_palin/integration/sunri/.classpath branches/maeste_palin/integration/sunri/build.xml branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml Log: Added a microkernel configurable mapping for JDK-->JBoss Log Level. We can consider fixed JBWS-1675 Modified: branches/maeste_palin/integration/sunri/.classpath =================================================================== --- branches/maeste_palin/integration/sunri/.classpath 2007-06-15 14:36:18 UTC (rev 3599) +++ branches/maeste_palin/integration/sunri/.classpath 2007-06-15 16:27:34 UTC (rev 3600) @@ -24,5 +24,6 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> + <classpathentry kind="lib" path="/dati/jboss-4.2.0.CR2/lib/jboss-common.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: branches/maeste_palin/integration/sunri/build.xml =================================================================== --- branches/maeste_palin/integration/sunri/build.xml 2007-06-15 14:36:18 UTC (rev 3599) +++ branches/maeste_palin/integration/sunri/build.xml 2007-06-15 16:27:34 UTC (rev 3600) @@ -118,7 +118,8 @@ <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> <include name="org/jboss/wsf/stack/sunri50/**"/> <include name="org/jboss/wsf/stack/sunri/metadata/**"/> - <include name="org/jboss/wsf/stack/sunri/*"/> + <include name="org/jboss/wsf/stack/sunri/log/**"/> + <include name="org/jboss/wsf/stack/sunri/*"/> </fileset> </jar> Modified: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-15 14:36:18 UTC (rev 3599) +++ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-15 16:27:34 UTC (rev 3600) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.stack.sunri.log; +import java.util.Map; import java.util.logging.ErrorManager; import java.util.logging.Handler; import java.util.logging.Level; @@ -40,10 +41,14 @@ */ public class JBossLogHandler extends Handler { + private Map<String, String> levelMap; + private String defaultLevel; - public JBossLogHandler() + public JBossLogHandler(Map<String, String> levelMap, String defaultLevel) { super.setFormatter(new SimpleFormatter()); + this.levelMap = levelMap; + this.defaultLevel = defaultLevel; } @Override @@ -65,29 +70,56 @@ reportError(null, ex, ErrorManager.FORMAT_FAILURE); return; } - if (record.getLevel() == Level.INFO) + + String level = levelMap.get(record.getLevel().getName()); + level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level; + msg = msg + "**" + record.getLevel().getName() + "==" + level + ";"; + level = level == null ? defaultLevel : level; + if ("info".equalsIgnoreCase(level)) { - Logger.getLogger(record.getSourceClassName()).info(msg); + if (Logger.getLogger(record.getSourceClassName()).isInfoEnabled()) + { + Logger.getLogger(record.getSourceClassName()).info(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } + } - else if (record.getLevel() == Level.SEVERE) + else if ("error".equalsIgnoreCase(level)) { Logger.getLogger(record.getSourceClassName()).error(msg); } - else if (record.getLevel() == Level.WARNING) + else if ("warn".equalsIgnoreCase(level)) { Logger.getLogger(record.getSourceClassName()).warn(msg); } - else if (record.getLevel() == Level.FINE) + else if ("debug".equalsIgnoreCase(level)) { - Logger.getLogger(record.getSourceClassName()).debug(msg); + if (Logger.getLogger(record.getSourceClassName()).isDebugEnabled()) + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } } - else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST) + else if ("trace".equalsIgnoreCase(level)) { - Logger.getLogger(record.getSourceClassName()).trace(msg); + if (Logger.getLogger(record.getSourceClassName()).isTraceEnabled()) + { + Logger.getLogger(record.getSourceClassName()).trace(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } } else { - Logger.getLogger(record.getSourceClassName()).debug(msg); + Logger.getLogger(record.getSourceClassName()).warn("[WAS-UNKNOWN]" + msg); } } Modified: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-15 14:36:18 UTC (rev 3599) +++ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-15 16:27:34 UTC (rev 3600) @@ -21,8 +21,10 @@ */ package org.jboss.wsf.stack.sunri.log; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.logging.Filter; import java.util.logging.Handler; import java.util.logging.Level; @@ -40,6 +42,8 @@ public class JDKLogRedirector { private List<String> namespaces = new LinkedList<String>(); + private Map<String, String> levelMapping = new HashMap<String, String>(); + private String defaultLevel; private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class); public JDKLogRedirector() @@ -48,6 +52,12 @@ public void changeHandlers() { + for (String entry : levelMapping.keySet()) + { + Logger.getLogger(this.getClass()).info("key:" + entry); + Logger.getLogger(this.getClass()).info("value:" + levelMapping.get(entry)); + + } for (String ns : namespaces) { changeHandler(ns); @@ -90,7 +100,7 @@ } } myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns); - Handler jbossLogHandler = new JBossLogHandler(); + Handler jbossLogHandler = new JBossLogHandler(levelMapping,defaultLevel); jbossLogHandler.setLevel(Level.ALL); java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); } @@ -109,6 +119,31 @@ public void setNamespaces(List<String> namespaces) { this.namespaces = namespaces; + } + + public String getDefaultLevel() + { + return defaultLevel; + } + + public void setDefaultLevel(String defaultLevel) + { + this.defaultLevel = defaultLevel; changeHandlers(); } + + public Map<String, String> getLevelMapping() + { + return levelMapping; + } + + public void setLevelMapping(Map<String, String> levelMapping) + { + this.levelMapping = levelMapping; + } + + public String putLevelMappingEntry(String key, String value) + { + return levelMapping.put(key, value); + } } Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-15 14:36:18 UTC (rev 3599) +++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-15 16:27:34 UTC (rev 3600) @@ -221,6 +221,17 @@ <value>com.sun</value> </list> </property> + <property name="levelMapping"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>INFO</key><value>info</value></entry> + <entry><key>SEVERE</key><value>error</value></entry> + <entry><key>WARNING</key><value>warn</value></entry> + <entry><key>FINE</key><value>debug</value></entry> + <entry><key>FINER</key><value>trace</value></entry> + <entry><key>FINEST</key><value>trace</value></entry> + </map> + </property> + <property name="defaultLevel">debug</property> </bean> </deployment> \ No newline at end of file Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-15 14:36:18 UTC (rev 3599) +++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-15 16:27:34 UTC (rev 3600) @@ -252,6 +252,17 @@ <value>com.sun</value> </list> </property> + <property name="levelMapping"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>INFO</key><value>info</value></entry> + <entry><key>SEVERE</key><value>error</value></entry> + <entry><key>WARNING</key><value>warn</value></entry> + <entry><key>FINE</key><value>debug</value></entry> + <entry><key>FINER</key><value>trace</value></entry> + <entry><key>FINEST</key><value>trace</value></entry> + </map> + </property> + <property name="defaultLevel">debug</property> </bean> </deployment>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3599 - in branches/maeste_palin/integration/sunri/src/main: java/org/jboss/wsf/stack/sunri/log and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-06-15 10:36:18 -0400 (Fri, 15 Jun 2007) New Revision: 3599 Added: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java Removed: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/ Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml Log: moving JDKLogRedirect on integration/sunri source directory. Second and final step Copied: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java (from rev 3598, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java) =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java (rev 0) +++ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-15 14:36:18 UTC (rev 3599) @@ -0,0 +1,116 @@ +/* + * 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.wsf.stack.sunri.log; + +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.SimpleFormatter; + +import org.jboss.logging.Logger; + +/** + * A Handler (java.util.logging.Handler) class redirecting messages + * to the jboss logging system. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class JBossLogHandler extends Handler +{ + + public JBossLogHandler() + { + super.setFormatter(new SimpleFormatter()); + } + + @Override + public void publish(LogRecord record) + { + if (!isLoggable(record)) + { + return; + } + String msg; + try + { + msg = getFormatter().formatMessage(record); + } + catch (Exception ex) + { + // We don't want to throw an exception here, but we + // report the exception to any registered ErrorManager. + reportError(null, ex, ErrorManager.FORMAT_FAILURE); + return; + } + if (record.getLevel() == Level.INFO) + { + Logger.getLogger(record.getSourceClassName()).info(msg); + } + else if (record.getLevel() == Level.SEVERE) + { + Logger.getLogger(record.getSourceClassName()).error(msg); + } + else if (record.getLevel() == Level.WARNING) + { + Logger.getLogger(record.getSourceClassName()).warn(msg); + } + else if (record.getLevel() == Level.FINE) + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST) + { + Logger.getLogger(record.getSourceClassName()).trace(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + } + + @Override + public boolean isLoggable(LogRecord record) + { + if (record == null) + { + return false; + } + return super.isLoggable(record); + } + + @Override + public void flush() + { + //nothing to do + } + + @Override + public void close() throws SecurityException + { + //nothing to do + } + +} \ No newline at end of file Copied: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java (from rev 3598, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java) =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java (rev 0) +++ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-15 14:36:18 UTC (rev 3599) @@ -0,0 +1,114 @@ +/* + * 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.wsf.stack.sunri.log; + +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Filter; +import java.util.logging.Handler; +import java.util.logging.Level; + +import org.jboss.logging.Logger; + +/** + * Redirects JDK Logger output to the JBoss Logger. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class JDKLogRedirector +{ + private List<String> namespaces = new LinkedList<String>(); + private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class); + + public JDKLogRedirector() + { + } + + public void changeHandlers() + { + for (String ns : namespaces) + { + changeHandler(ns); + } + } + + /** + * Modifies the jdk root logger in order not to log records coming from + * loggers with the provided namespace; these records are then logged + * through the JBoss Logger. + * + * @param ns + */ + public void changeHandler(String ns) + { + if (ns == null) + ns = ""; + myLogger.debug("Changing current root logger's log handlers to hide records with namespace " + ns); + java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); + Handler[] handlers = jdkRootLogger.getHandlers(); + for (int i = 0; i < handlers.length; i++) + { + Handler handler = handlers[i]; + if (!(handler instanceof JBossLogHandler)) + { + StringBuffer sb = new StringBuffer("Disableing handler "); + sb.append(handler).append(" with level ").append(handler.getLevel()); + myLogger.debug(sb); + Filter f = handler.getFilter(); + if (f != null && f instanceof NamespaceFilter) + { + ((NamespaceFilter)f).addNamespace(ns); + } + else + { + NamespaceFilter nsFilter = new NamespaceFilter(false); + nsFilter.addNamespace(ns); + handler.setFilter(nsFilter); + } + } + } + myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns); + Handler jbossLogHandler = new JBossLogHandler(); + jbossLogHandler.setLevel(Level.ALL); + java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); + } + + public void addNamespace(String ns) + { + namespaces.add(ns); + changeHandler(ns); + } + + public List<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(List<String> namespaces) + { + this.namespaces = namespaces; + changeHandlers(); + } +} Copied: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java (from rev 3598, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java) =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java (rev 0) +++ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java 2007-06-15 14:36:18 UTC (rev 3599) @@ -0,0 +1,96 @@ +/* + * 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.wsf.stack.sunri.log; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Filter; +import java.util.logging.LogRecord; + +/** + * A log filter allowing logging of LogRecord depending on the + * namespace of the Logger they have been collected by. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class NamespaceFilter implements Filter +{ + + private Set<String> namespaces; + private boolean show; + + public NamespaceFilter(boolean show) + { + this.show = show; + } + + public boolean isLoggable(LogRecord record) + { + String loggerName = record.getLoggerName(); + if (loggerName == null) + { + return true; + } + else + { + for (String ns : namespaces) + { + if (loggerName.startsWith(ns)) + { + return show; + } + } + return !show; + } + } + + public void addNamespace(String ns) + { + if (namespaces == null) + namespaces = new LinkedHashSet<String>(); + namespaces.add(ns); + } + + public Set<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(Set<String> namespaces) + { + this.namespaces = namespaces; + } + + public boolean isShow() + { + return show; + } + + public void setShow(boolean show) + { + this.show = show; + } + +} Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-15 14:32:43 UTC (rev 3598) +++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-15 14:36:18 UTC (rev 3599) @@ -214,7 +214,7 @@ </property> </bean> - <bean name="JDKLogRedirector" class="org.jboss.wsf.spi.utils.log.JDKLogRedirector"> + <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector"> <property name="namespaces"> <list class="java.util.LinkedList" elementClass="java.lang.String"> <value>javax.enterprise.resource.webservices.jaxws</value> Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-15 14:32:43 UTC (rev 3598) +++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-15 14:36:18 UTC (rev 3599) @@ -245,7 +245,7 @@ <depends>WebServiceMainDeployer</depends> </bean> - <bean name="JDKLogRedirector" class="org.jboss.wsf.spi.utils.log.JDKLogRedirector"> + <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector"> <property name="namespaces"> <list class="java.util.LinkedList" elementClass="java.lang.String"> <value>javax.enterprise.resource.webservices.jaxws</value>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3598 - in branches/maeste_palin/integration: sunri/src/main/java/org/jboss/wsf and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-06-15 10:32:43 -0400 (Fri, 15 Jun 2007) New Revision: 3598 Added: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/utils/ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/utils/log/ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/ Removed: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/ Log: moving JDKLogRedirector. First step, partial commit Copied: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/spi/utils/log (from rev 3591, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log)

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3597 - trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-15 10:22:55 -0400 (Fri, 15 Jun 2007) New Revision: 3597 Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml Log: Hudson uses build.sh Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-15 13:35:16 UTC (rev 3596) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-15 14:22:55 UTC (rev 3597) @@ -19,7 +19,7 @@ # cd $JBWSDIR/build cp ant.properties.example ant.properties -ant clean +./build.sh clean # # stop jbossas @@ -30,7 +30,7 @@ # deploy to jboss # cd $JBWSDIR/jbossws-core -ant $ENVIRONMENT deploy-jboss42 +./build.sh $ENVIRONMENT deploy-jboss42 # # start jbossas

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3596 - trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-15 09:35:16 -0400 (Fri, 15 Jun 2007) New Revision: 3596 Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml Log: Hudson uses build.sh Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-15 13:26:12 UTC (rev 3595) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-15 13:35:16 UTC (rev 3596) @@ -48,7 +48,7 @@ # # execute tests # -ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u #

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3595 - in trunk/integration: sunri/ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-15 09:26:12 -0400 (Fri, 15 Jun 2007) New Revision: 3595 Modified: trunk/integration/native/ant-import/build-bin-dist.xml trunk/integration/sunri/ant-import/build-bin-dist.xml trunk/integration/xfire/ant-import/build-bin-dist.xml Log: Include build.sh, tools/ant, etc in binary dist Modified: trunk/integration/native/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-15 13:15:06 UTC (rev 3594) +++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-15 13:26:12 UTC (rev 3595) @@ -25,12 +25,14 @@ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> <mkdir dir="${bindist.bin.dir}"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> + <mkdir dir="${bindist.tools.dir}"/>  <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"> @@ -147,6 +149,18 @@ <fileset dir="${int.native.dir}/src/test"/> </copy> +  + <copy todir="${bindist.tools.dir}" overwrite="true"> + <fileset dir="${build.dir}/tools/ant"/> + </copy> + <copy todir="${bindist.dir}" overwrite="true"> + <fileset dir="${build.dir}"> + <include name="build.bat"/> + <include name="build.sh"/> + </fileset> + </copy> + <chmod file="${bindist.dir}/build.sh" perm="+x"/> + <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip"> <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/> </zip> Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-15 13:15:06 UTC (rev 3594) +++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-15 13:26:12 UTC (rev 3595) @@ -28,12 +28,14 @@ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> <mkdir dir="${bindist.bin.dir}"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> + <mkdir dir="${bindist.tools.dir}"/>  <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"> @@ -120,6 +122,18 @@ <fileset dir="${int.sunri.dir}/src/test"/> </copy> +  + <copy todir="${bindist.tools.dir}" overwrite="true"> + <fileset dir="${build.dir}/tools/ant"/> + </copy> + <copy todir="${bindist.dir}" overwrite="true"> + <fileset dir="${build.dir}"> + <include name="build.bat"/> + <include name="build.sh"/> + </fileset> + </copy> + <chmod file="${bindist.dir}/build.sh" perm="+x"/> + <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/> </zip> Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-15 13:15:06 UTC (rev 3594) +++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-15 13:26:12 UTC (rev 3595) @@ -29,6 +29,7 @@ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> @@ -36,6 +37,7 @@ <mkdir dir="${bindist.lib.dir}/client"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> + <mkdir dir="${bindist.tools.dir}"/>  <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"> @@ -128,6 +130,18 @@ <fileset dir="${int.xfire.dir}/src/test"/> </copy> +  + <copy todir="${bindist.tools.dir}" overwrite="true"> + <fileset dir="${build.dir}/tools/ant"/> + </copy> + <copy todir="${bindist.dir}" overwrite="true"> + <fileset dir="${build.dir}"> + <include name="build.bat"/> + <include name="build.sh"/> + </fileset> + </copy> + <chmod file="${bindist.dir}/build.sh" perm="+x"/> + <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip"> <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/> </zip>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3594 - in trunk: build/tools and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-15 09:15:06 -0400 (Fri, 15 Jun 2007) New Revision: 3594 Added: trunk/build/build.bat trunk/build/build.conf trunk/build/build.sh trunk/build/tools/ trunk/build/tools/ant/ trunk/build/tools/ant/README_JDK6.txt trunk/build/tools/ant/bin/ trunk/build/tools/ant/bin/ant trunk/build/tools/ant/bin/ant.bat trunk/build/tools/ant/bin/ant.cmd trunk/build/tools/ant/bin/antRun trunk/build/tools/ant/bin/antRun.bat trunk/build/tools/ant/bin/antRun.pl trunk/build/tools/ant/bin/antenv.cmd trunk/build/tools/ant/bin/complete-ant-cmd.pl trunk/build/tools/ant/bin/envset.cmd trunk/build/tools/ant/bin/lcp.bat trunk/build/tools/ant/bin/runant.pl trunk/build/tools/ant/bin/runant.py trunk/build/tools/ant/bin/runrc.cmd trunk/build/tools/ant/endorsed/ trunk/build/tools/ant/endorsed/jaxb-api.jar trunk/build/tools/ant/endorsed/jaxws-api.jar trunk/build/tools/ant/etc/ trunk/build/tools/ant/etc/ant-bootstrap.jar trunk/build/tools/ant/etc/changelog.xsl trunk/build/tools/ant/etc/checkstyle/ trunk/build/tools/ant/etc/checkstyle/checkstyle-frames.xsl trunk/build/tools/ant/etc/checkstyle/checkstyle-text.xsl trunk/build/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl trunk/build/tools/ant/etc/coverage-frames.xsl trunk/build/tools/ant/etc/jdepend-frames.xsl trunk/build/tools/ant/etc/jdepend.xsl trunk/build/tools/ant/etc/junit-frames-xalan1.xsl trunk/build/tools/ant/etc/junit-frames.xsl trunk/build/tools/ant/etc/junit-noframes.xsl trunk/build/tools/ant/etc/log.xsl trunk/build/tools/ant/etc/maudit-frames.xsl trunk/build/tools/ant/etc/mmetrics-frames.xsl trunk/build/tools/ant/etc/tagdiff.xsl trunk/build/tools/ant/lib/ trunk/build/tools/ant/lib/README trunk/build/tools/ant/lib/ant-antlr.jar trunk/build/tools/ant/lib/ant-apache-bcel.jar trunk/build/tools/ant/lib/ant-apache-bsf.jar trunk/build/tools/ant/lib/ant-apache-log4j.jar trunk/build/tools/ant/lib/ant-apache-oro.jar trunk/build/tools/ant/lib/ant-apache-regexp.jar trunk/build/tools/ant/lib/ant-apache-resolver.jar trunk/build/tools/ant/lib/ant-commons-logging.jar trunk/build/tools/ant/lib/ant-commons-net.jar trunk/build/tools/ant/lib/ant-jai.jar trunk/build/tools/ant/lib/ant-javamail.jar trunk/build/tools/ant/lib/ant-jdepend.jar trunk/build/tools/ant/lib/ant-jmf.jar trunk/build/tools/ant/lib/ant-jsch.jar trunk/build/tools/ant/lib/ant-junit.jar trunk/build/tools/ant/lib/ant-launcher.jar trunk/build/tools/ant/lib/ant-netrexx.jar trunk/build/tools/ant/lib/ant-nodeps.jar trunk/build/tools/ant/lib/ant-starteam.jar trunk/build/tools/ant/lib/ant-stylebook.jar trunk/build/tools/ant/lib/ant-swing.jar trunk/build/tools/ant/lib/ant-testutil.jar trunk/build/tools/ant/lib/ant-trax.jar trunk/build/tools/ant/lib/ant-weblogic.jar trunk/build/tools/ant/lib/ant.jar trunk/build/tools/ant/lib/junit.jar trunk/build/tools/ant/lib/libraries.properties trunk/build/tools/ant/lib/xercesImpl.jar trunk/build/tools/ant/lib/xml-apis.jar trunk/integration/native/build.bat trunk/integration/native/build.sh trunk/integration/spi/build.bat trunk/integration/spi/build.sh trunk/integration/sunri/build.bat trunk/integration/sunri/build.sh trunk/integration/xfire/build.bat trunk/integration/xfire/build.sh trunk/jbossws-core/build.bat trunk/jbossws-core/build.sh Log: Rely on build.sh to override endorsed libs.It's necessary when running under with JDK 6 Added: trunk/build/build.bat =================================================================== --- trunk/build/build.bat (rev 0) +++ trunk/build/build.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,109 @@ +@echo off + +REM ====================================================================== +REM +REM This is the main entry point for the build system. +REM +REM Users should be sure to execute this file rather than 'ant' to ensure +REM the correct version is being used with the correct configuration. +REM +REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 +REM +REM ====================================================================== +REM +REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ + +REM ****************************************************** +REM Ignore the ANT_HOME variable: we want to use *our* +REM ANT version and associated JARs. +REM ****************************************************** +REM Ignore the users classpath, cause it might mess +REM things up +REM ****************************************************** + +SETLOCAL + +set NOPAUSE=true +set CLASSPATH= +set ANT_HOME= + +set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat + +REM ****************************************************** +REM JDK 6 Settings +REM Uncomment when using JDK 6 +REM ****************************************************** +REM set USE_JDK6=true + +REM +REM - "for" loops have been unrolled for compatibility +REM with some WIN32 systems. +REM ****************************************************** + +set NAMES=build\tools;build\tools\ant;build\tools\apache\ant +set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. + +REM ****************************************************** +REM ********Save the command line arguments*************** +REM ****************************************************** +set BUILD_ARGS=%1 +if ""%1""=="""" goto completedArgs +shift +:processArg +if ""%1""=="""" goto completedArgs +set BUILD_ARGS=%BUILD_ARGS% %1 +shift +goto processArg + +:completedArgs + +REM ****************************************************** +REM ****************************************************** + +SET EXECUTED=FALSE +for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ********* Search for names in the subfolders ********* +REM ****************************************************** + +:subLoop +for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************ Test if ANT Batch file exists *********** +REM ****************************************************** + +:testIfExists +if exist %1 call :BatchFound %1 %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************** Batch file has been found ************* +REM ****************************************************** + +:BatchFound +if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% +set EXECUTED=TRUE + +goto :EOF + +REM ****************************************************** +REM ************* Execute Batch file only once *********** +REM ****************************************************** + +:ExecuteBatch +echo Calling %1 %BUILD_ARGS% + +REM set ENDORSED= +call %1 %BUILD_ARGS% + +:end + +if "%NOPAUSE%" == "" pause + Property changes on: trunk/build/build.bat ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/build.conf =================================================================== --- trunk/build/build.conf (rev 0) +++ trunk/build/build.conf 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,7 @@ + +## +## Build configuration +## + +# Uncomment when using JDK 6 +#USE_JDK6=true Added: trunk/build/build.sh =================================================================== --- trunk/build/build.sh (rev 0) +++ trunk/build/build.sh 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,187 @@ +#!/bin/sh +### ====================================================================== ### +## ## +## This is the main entry point for the build system. ## +## ## +## Users should be sure to execute this file rather than 'ant' to ensure ## +## the correct version is being used with the correct configuration. ## +## ## +## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## +## ## +### ====================================================================== ### + +# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` +GREP="grep" +ROOT="/" + +# Ignore user's ANT_HOME if it is set +ANT_HOME="" + +# Uncomment when using JDK 6 +#USE_JDK6=true + +# the default search path for ant +ANT_SEARCH_PATH="\ + tools + tools/ant \ + tools/apache/ant \ + ant \ + ../build/tools/ant \ + ../../build/tools/ant \ + ../../../build/tools/ant " + +# the default build file name +ANT_BUILD_FILE="build.xml" + +# the default arguments +ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + + Darwin*) + darwin=true + ;; +esac + +# +# Helper to complain. +# +die() { + echo "${PROGNAME}: $*" + exit 1 +} + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to source a file if it exists. +# +maybe_source() { + for file in $*; do + if [ -f "$file" ]; then + . $file + fi + done +} + +search() { + search="$*" + for d in $search; do + ANT_HOME="`pwd`/$d" + ANT="$ANT_HOME/bin/ant" + if [ -x "$ANT" ]; then + # found one + echo $ANT_HOME + break + fi + done +} + +# +# Main function. +# +main() { + # if there is a build config file. then source it + maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf" + + # Increase the maximum file descriptors if we can + if [ $cygwin = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + # use the system max + MAX_FD="$MAX_FD_LIMIT" + fi + + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi + fi + + # try the search path + ANT_HOME=`search $ANT_SEARCH_PATH` + + # try looking up to root + if [ "x$ANT_HOME" = "x" ]; then + target="build" + _cwd=`pwd` + + while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do + cd .. + cwd=`pwd` + ANT_HOME=`search $ANT_SEARCH_PATH` + done + + # make sure we get back + cd $_cwd + + if [ "$cwd" != "$ROOT" ]; then + found="true" + fi + + # complain if we did not find anything + if [ "$found" != "true" ]; then + die "Could not locate Ant; check \$ANT or \$ANT_HOME." + fi + fi + + # make sure we have one + ANT=$ANT_HOME/bin/ant + if [ ! -x "$ANT" ]; then + die "Ant file is not executable: $ANT" + fi + + # Set the max memory to 256m + ANT_OPTS=-Xmx256m + + if [ "x$USE_JDK6" = "xtrue" ]; then + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" + echo "--------------------------------------" + echo "Endorsed Directory: $ANT_HOME/endorsed" + echo "--------------------------------------" + fi + + # setup some build properties + ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" + + # change to the directory where the script lives so users are not forced + # to be in the same directory as build.xml + cd $DIRNAME + + # export some stuff for ant + export ANT ANT_HOME ANT_OPTS + + # execute in debug mode, or simply execute + if [ "x$ANT_DEBUG" != "x" ]; then + /bin/sh -x $ANT $ANT_OPTIONS "$@" + else + exec $ANT $ANT_OPTIONS "$@" + fi +} + +## +## Bootstrap +## + +main "$@" Property changes on: trunk/build/build.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/tools/ant/README_JDK6.txt =================================================================== --- trunk/build/tools/ant/README_JDK6.txt (rev 0) +++ trunk/build/tools/ant/README_JDK6.txt 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,7 @@ +The endorsed libs in this directory are used by the build scripts +when running JDK 1.6. In order enable the endorsed mechanism uncomment the +USE_JDK6 property within the build scripts, or change it in build/build.conf + +See http://jira.jboss.com/jira/browse/JBWS-1439 + + Property changes on: trunk/build/tools/ant/README_JDK6.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/build/tools/ant/bin/ant =================================================================== --- trunk/build/tools/ant/bin/ant (rev 0) +++ trunk/build/tools/ant/bin/ant 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,326 @@ +#! /bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Extract launch and ant arguments, (see details below). +ant_exec_args= +no_config=false +use_jikes_default=false +ant_exec_debug=false +show_help=false +for arg in "$@" ; do + if [ "$arg" = "--noconfig" ] ; then + no_config=true + elif [ "$arg" = "--usejikes" ] ; then + use_jikes_default=true + elif [ "$arg" = "--execdebug" ] ; then + ant_exec_debug=true + elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then + show_help=true + ant_exec_args="$ant_exec_args -h" + else + if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then + show_help=true + fi + ant_exec_args="$ant_exec_args \"$arg\"" + fi +done + +# Source/default ant configuration +if $no_config ; then + rpm_mode=false + usejikes=$use_jikes_default +else + # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set) + if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then + if [ -f "/etc/ant.conf" ] ; then + . /etc/ant.conf + fi + fi + + # load user ant configuration + if [ -f "$HOME/.ant/ant.conf" ] ; then + . $HOME/.ant/ant.conf + fi + if [ -f "$HOME/.antrc" ] ; then + . "$HOME/.antrc" + fi + + # provide default configuration values + if [ -z "$rpm_mode" ] ; then + rpm_mode=false + fi + if [ -z "$usejikes" ] ; then + usejikes=$use_jikes_default + fi +fi + +# Setup Java environment in rpm mode +if $rpm_mode ; then + if [ -f /usr/share/java-utils/java-functions ] ; then + . /usr/share/java-utils/java-functions + set_jvm + set_javacmd + fi +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) cygwin=true ;; + Darwin*) darwin=true + if [ -z "$JAVA_HOME" ] ; then + JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home + fi + ;; +esac + +if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then + ## resolve links - $0 may be a link to ant's home + PRG="$0" + progname=`basename "$0"` + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> $.*$$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi + done + + ANT_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + ANT_HOME=`cd "$ANT_HOME" && pwd` +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$ANT_HOME" ] && + ANT_HOME=`cygpath --unix "$ANT_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# set ANT_LIB location +ANT_LIB="${ANT_HOME}/lib" + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + JAVACMD="$JAVA_HOME/jre/sh/java" + elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then + JAVACMD="$JAVA_HOME/jre/bin/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD=`which java 2> /dev/null ` + if [ -z "$JAVACMD" ] ; then + JAVACMD=java + fi + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." + echo " We cannot execute $JAVACMD" + exit 1 +fi + +# Build local classpath using just the launcher in non-rpm mode or +# use the Jpackage helper in rpm mode with basic and default jars +# specified in the ant.conf configuration. Because the launcher is +# used, libraries linked in ANT_HOME/lib will also be included, but this +# is discouraged as it is not java-version safe. A user should +# request optional jars and their dependencies via the OPT_JAR_LIST +# variable +if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then + LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" + + # If no optional jars have been specified then build the default list + if [ -z "$OPT_JAR_LIST" ] ; then + for file in /etc/ant.d/*; do + if [ -f "$file" ]; then + case "$file" in + *~) ;; + *#*) ;; + *.rpmsave) ;; + *.rpmnew) ;; + *) + for dep in `cat "$file"`; do + case "$OPT_JAR_LIST" in + *"$dep"*) ;; + *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep" + esac + done + esac + fi + done + fi + + # If the user requested to try to add some other jars to the classpath + if [ -n "$OPT_JAR_LIST" ] ; then + _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" + if [ -n "$_OPTCLASSPATH" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH" + fi + fi + + # Explicitly add javac path to classpath, assume JAVA_HOME set + # properly in rpm mode + if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar" + fi + if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip" + fi + + # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be + # user CLASSPATH first and ant-found jars after. + # In that case, the user CLASSPATH will override ant-found jars + # + # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour + # with ant-found jars first and user CLASSPATH after + if [ -n "$CLASSPATH" ] ; then + # merge local and specified classpath + if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH="$CLASSPATH" + elif [ -n "$CLASSPATH_OVERRIDE" ] ; then + LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH" + else + LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH" + fi + + # remove class path from launcher -cp option + CLASSPATH="" + fi +else + # not using rpm_mode; use launcher to determine classpaths + if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar + else + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH + fi +fi + +if [ -n "$JAVA_HOME" ] ; then + # OSX hack to make Ant work with jikes + if $darwin ; then + OSXHACK="${JAVA_HOME}/../Classes" + if [ -d "${OSXHACK}" ] ; then + for i in "${OSXHACK}"/*.jar + do + JIKESPATH="$JIKESPATH:$i" + done + fi + fi +fi + +# Allow Jikes support (off by default) +if $usejikes; then + ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes" +fi + +# For Cygwin, switch paths to appropriate format before running java +# For PATHs convert to unix format first, then to windows format to ensure +# both formats are supported. Probably this will fail on directories with ; +# in the name in the path. Let's assume that paths containing ; are more +# rare than windows style paths on cygwin. +if $cygwin; then + if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then + format=mixed + else + format=windows + fi + ANT_HOME=`cygpath --$format "$ANT_HOME"` + ANT_LIB=`cygpath --$format "$ANT_LIB"` + JAVA_HOME=`cygpath --$format "$JAVA_HOME"` + LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"` + LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"` + if [ -n "$CLASSPATH" ] ; then + CP_TEMP=`cygpath --path --unix "$CLASSPATH"` + CLASSPATH=`cygpath --path --$format "$CP_TEMP"` + fi + CYGHOME=`cygpath --$format "$HOME"` +fi + +# Show script help if requested +if $show_help ; then + echo $0 '[script options] [options] [target [target2 [target3] ..]]' + echo 'Script Options:' + echo ' --help, --h print this message and ant help' + echo ' --noconfig suppress sourcing of /etc/ant.conf,' + echo ' $HOME/.ant/ant.conf, and $HOME/.antrc' + echo ' configuration files' + echo ' --usejikes enable use of jikes by default, unless' + echo ' set explicitly in configuration files' + echo ' --execdebug print ant exec line generated by this' + echo ' launch script' + echo ' ' +fi +# add a second backslash to variables terminated by a backslash under cygwin +if $cygwin; then + case "$ANT_HOME" in + *\\ ) + ANT_HOME="$ANT_HOME\\" + ;; + esac + case "$CYGHOME" in + *\\ ) + CYGHOME="$CYGHOME\\" + ;; + esac + case "$JIKESPATH" in + *\\ ) + JIKESPATH="$JIKESPATH\\" + ;; + esac + case "$LOCALCLASSPATH" in + *\\ ) + LOCALCLASSPATH="$LOCALCLASSPATH\\" + ;; + esac + case "$CLASSPATH" in + *\\ ) + CLASSPATH="$CLASSPATH\\" + ;; + esac +fi +# Execute ant using eval/exec to preserve spaces in paths, +# java options, and ant args +ant_sys_opts= +if [ -n "$CYGHOME" ]; then + if [ -n "$JIKESPATH" ]; then + ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\"" + else + ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\"" + fi +else + if [ -n "$JIKESPATH" ]; then + ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\"" + fi +fi +ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args" +if $ant_exec_debug ; then + echo $ant_exec_command +fi +eval $ant_exec_command Property changes on: trunk/build/tools/ant/bin/ant ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/tools/ant/bin/ant.bat =================================================================== --- trunk/build/tools/ant/bin/ant.bat (rev 0) +++ trunk/build/tools/ant/bin/ant.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,228 @@ +@echo off + +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. + +REM This is an inordinately troublesome piece of code, particularly because it +REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x +REM support, things would be much easier, but sadly, it is not yet time. +REM Be cautious about editing this, and only add WinNT specific stuff in code that +REM only runs on WinNT. + +if "%HOME%"=="" goto homeDrivePathPre +if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat" + +:homeDrivePathPre +if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre +if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre +if exist "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" + +:userProfilePre +if "%USERPROFILE%"=="" goto alpha +if "%USERPROFILE%"=="%HOME%" goto alpha +if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha +if exist "%USERPROFILE%\antrc_pre.bat" call "%USERPROFILE%\antrc_pre.bat" + +:alpha + +if "%OS%"=="Windows_NT" @setlocal +if "%OS%"=="WINNT" @setlocal + +if "%ANT_HOME%"=="" goto setDefaultAntHome + +:stripAntHome +if not _%ANT_HOME:~-1%==_\ goto checkClasspath +set ANT_HOME=%ANT_HOME:~0,-1% +goto stripAntHome + +:setDefaultAntHome +rem %~dp0 is expanded pathname of the current script under NT +set ANT_HOME=%~dp0.. + +:checkClasspath +set _USE_CLASSPATH=yes +rem CLASSPATH must not be used if it is equal to "" +if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no +if "%CLASSPATH%"=="" set _USE_CLASSPATH=no + +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). +set ANT_CMD_LINE_ARGS=%1 +if ""%1""=="""" goto doneStart +shift +:setupArgs +if ""%1""=="""" goto doneStart +if ""%1""==""-noclasspath"" goto clearclasspath +set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 +shift +goto setupArgs + +rem here is there is a -noclasspath in the options +:clearclasspath +set _USE_CLASSPATH=no +shift +goto setupArgs + +rem This label provides a place for the argument list loop to break out +rem and for NT handling to skip to. + +:doneStart + +if _USE_CLASSPATH==no goto findAntHome + +:stripClasspath +if not _%CLASSPATH:~-1%==_\ goto findAntHome +set CLASSPATH=%CLASSPATH:~0,-1% +goto stripClasspath + +:findAntHome +rem find ANT_HOME if it does not exist due to either an invalid value passed +rem by the user or the %0 problem on Windows 9x +if exist "%ANT_HOME%\lib\ant.jar" goto checkJava + +rem check for ant in Program Files +if not exist "%ProgramFiles%\ant" goto checkSystemDrive +set ANT_HOME=%ProgramFiles%\ant +goto checkJava + +:checkSystemDrive +rem check for ant in root directory of system drive +if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive +set ANT_HOME=%SystemDrive%\ant +goto checkJava + +:checkCDrive +rem check for ant in C:\ant for Win9X users +if not exist C:\ant\lib\ant.jar goto noAntHome +set ANT_HOME=C:\ant +goto checkJava + +:noAntHome +echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME. +goto end + +:checkJava +set _JAVACMD=%JAVACMD% + +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe +goto checkJikes + +:noJavaHome +if "%_JAVACMD%" == "" set _JAVACMD=java.exe + +:checkJikes +if not "%JIKESPATH%"=="" goto runAntWithJikes + +:runAnt +if %USE_JDK6%=="true" set ANT_OPTS=%ANT_OPTS% -Djava.endorsed.dirs=%ANT_HOME%\endorsed + +if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath +:runAntWithClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:runAntNoClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:runAntWithJikes + +if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath +set JIKESPATH=%JIKESPATH:~0,-1% +goto runAntWithJikes + +:checkJikesAndClasspath + +if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath + +:runAntWithJikesAndClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:runAntWithJikesNoClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% +rem Check the error code of the Ant build +if not "%OS%"=="Windows_NT" goto onError +set ANT_ERROR=%ERRORLEVEL% +goto end + +:onError +rem Windows 9x way of checking the error code. It matches via brute force. +for %%i in (1 10 100) do set err%%i= +for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i +if %err100%==2 goto onError200 +if %err100%==0 set err100= +for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i +if "%err100%"=="" if %err10%==0 set err10= +:onError1 +for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i +goto onErrorEnd +:onError200 +for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i +if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i +if not err10==5 goto onError1 +:onErrorEnd +set ANT_ERROR=%err100%%err10%%err1% +for %%i in (1 10 100) do set err%%i= + +:end +rem bug ID 32069: resetting an undefined env variable changes the errorlevel. +if not "%_JAVACMD%"=="" set _JAVACMD= +if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS= + +if "%ANT_ERROR%"=="0" goto mainEnd + +rem Set the return code if we are not in NT. We can only set +rem a value of 1, but it's better than nothing. +if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1 + +rem Set the ERRORLEVEL if we are running NT. +if "%OS%"=="Windows_NT" color 00 + +goto omega + +:mainEnd + +rem If there were no errors, we run the post script. +if "%OS%"=="Windows_NT" @endlocal +if "%OS%"=="WINNT" @endlocal + +if "%HOME%"=="" goto homeDrivePathPost +if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat" + +:homeDrivePathPost +if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost +if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost +if exist "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" + +:userProfilePost +if "%USERPROFILE%"=="" goto omega +if "%USERPROFILE%"=="%HOME%" goto omega +if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega +if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat" + +:omega + Added: trunk/build/tools/ant/bin/ant.cmd =================================================================== --- trunk/build/tools/ant/bin/ant.cmd (rev 0) +++ trunk/build/tools/ant/bin/ant.cmd 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,93 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Run ant +*/ + +'@echo off' +parse arg mode envarg '::' antarg + +if mode\='.' & mode\='..' & mode\='/' then do + envarg = mode envarg + mode = '' +end + +if antarg = '' then do + antarg = envarg + envarg = '' +end + +x = setlocal() + +env="OS2ENVIRONMENT" +antenv = _getenv_('antenv') +if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"' + +if mode = '' then mode = _getenv_('ANT_MODE' '..') +if mode \= '/' then do + runrc = _getenv_('runrc') + antrc = _getenv_('antrc' 'antrc.cmd') + if mode = '..' then mode = '-r' + else mode = '' + interpret 'call "' || runrc || '"' antrc '"' || mode || '"' +end + +if _testenv_() = 0 then do + say 'Ant environment is not set properly' + x = endlocal() + exit 16 +end + +settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME + +java = _getenv_('javacmd' 'java') +opts = value('ANT_OPTS',,env) +args = value('ANT_ARGS',,env) +lcp = value('LOCALCLASSPATH',,env) +cp = value('CLASSPATH',,env) +if value('ANT_USE_CP',,env) \= '' then do + if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';' + lcp = lcp || cp + 'SET CLASSPATH=' +end +if lcp\='' then lcp = '-classpath' lcp + +cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg +launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists') +if launcher = '' then entry = 'org.apache.tools.ant.Main' +else entry = 'org.apache.tools.ant.launch.Launcher' +java opts lcp entry settings args antarg + +x = endlocal() + +return rc + +_testenv_: procedure expose env ANT_HOME JAVA_HOME +ANT_HOME = value('ANT_HOME',,env) +if ANT_HOME = '' then return 0 +JAVA_HOME = value('JAVA_HOME',,env) +if JAVA_HOME = '' then return 0 +cp = translate(value('CLASSPATH',,env)) +if pos(translate(ANT_HOME), cp) = 0 then return 0 +if pos(translate(JAVA_HOME), cp) = 0 then return 0 +return 1 + +_getenv_: procedure expose env +parse arg envar default +if default = '' then default = envar +var = value(translate(envar),,env) +if var = '' then var = default +return var Added: trunk/build/tools/ant/bin/antRun =================================================================== --- trunk/build/tools/ant/bin/antRun (rev 0) +++ trunk/build/tools/ant/bin/antRun 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,24 @@ +#! /bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Args: DIR command +cd "$1" +CMD="$2" +shift +shift + +exec "$CMD" "$@" Property changes on: trunk/build/tools/ant/bin/antRun ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/tools/ant/bin/antRun.bat =================================================================== --- trunk/build/tools/ant/bin/antRun.bat (rev 0) +++ trunk/build/tools/ant/bin/antRun.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,50 @@ +@echo off + +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. + +if "%OS%"=="Windows_NT" @setlocal +if "%OS%"=="WINNT" @setlocal + +if ""%1""=="""" goto runCommand + +rem Change drive and directory to %1 +if "%OS%"=="Windows_NT" goto nt_cd +if "%OS%"=="WINNT" goto nt_cd +cd ""%1"" +goto end_cd +:nt_cd +cd /d ""%1"" +:end_cd +shift + +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). +set ANT_RUN_CMD=%1 +if ""%1""=="""" goto runCommand +shift +:loop +if ""%1""=="""" goto runCommand +set ANT_RUN_CMD=%ANT_RUN_CMD% %1 +shift +goto loop + +:runCommand +rem echo %ANT_RUN_CMD% +%ANT_RUN_CMD% + +if "%OS%"=="Windows_NT" @endlocal +if "%OS%"=="WINNT" @endlocal + Added: trunk/build/tools/ant/bin/antRun.pl =================================================================== --- trunk/build/tools/ant/bin/antRun.pl (rev 0) +++ trunk/build/tools/ant/bin/antRun.pl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,66 @@ +#!/usr/bin/perl +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +####################################################################### +# +# antRun.pl +# +# wrapper script for invoking commands on a platform with Perl installed +# this is akin to antRun.bat, and antRun the SH script +# +# created: 2001-10-18 +# author: Jeff Tulley jtulley(a)novell.com +####################################################################### +#be fussy about variables +use strict; + +#turn warnings on during dev; generates a few spurious uninitialised var access warnings +#use warnings; + +#and set $debug to 1 to turn on trace info (currently unused) +my $debug=1; + +####################################################################### +# change drive and directory to "%1" +my $ANT_RUN_CMD = @ARGV[0]; + +# assign current run command to "%2" +chdir (@ARGV[0]) || die "Can't cd to $ARGV[0]: $!\n"; +if ($^O eq "NetWare") { + # There is a bug in Perl 5 on NetWare, where chdir does not + # do anything. On NetWare, the following path-prefixed form should + # always work. (afaict) + $ANT_RUN_CMD .= "/".@ARGV[1]; +} +else { + $ANT_RUN_CMD = @ARGV[1]; +} + +# dispose of the first two arguments, leaving only the command's args. +shift; +shift; + +# run the command +my $returnValue = system $ANT_RUN_CMD, @ARGV; +if ($returnValue eq 0) { + exit 0; +} +else { + # only 0 and 1 are widely recognized as exit values + # so change the exit value to 1 + exit 1; +} Property changes on: trunk/build/tools/ant/bin/antRun.pl ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/tools/ant/bin/antenv.cmd =================================================================== --- trunk/build/tools/ant/bin/antenv.cmd (rev 0) +++ trunk/build/tools/ant/bin/antenv.cmd 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,98 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +'@echo off' +call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs" +call SysLoadFuncs + +/* Prepare the parameters for later use */ +parse arg argv +mode = '' +args = '' +opts = '' +cp = '' +lcp = '' + +do i = 1 to words(argv) + param = word(argv, i) + select + when param='-lcp' then mode = 'l' + when param='-cp' | param='-classpath' then mode = 'c' + when abbrev('-opts', param, 4) then mode = 'o' + when abbrev('-args', param, 4) then mode = 'a' + otherwise + select + when mode = 'a' then args = space(args param, 1) + when mode = 'c' then cp = space(cp param, 1) + when mode = 'l' then lcp = space(lcp param, 1) + when mode = 'o' then opts = space(opts param, 1) + otherwise + say 'Option' param 'ignored' + end + end +end + +env="OS2ENVIRONMENT" +antconf = _getenv_('antconf' 'antconf.cmd') +runrc = _getenv_('runrc') +interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC' +ANT_HOME = value('ANT_HOME',,env) +JAVA_HOME = value('JAVA_HOME',,env) +classpath = value('CLASSPATH',,env) +classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS") +if classes \= '' then classpath = prepend(classpath classes) +classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS") +if classes \= '' then classpath = prepend(classpath classes) + +classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar') +'SET CLASSPATH=' || classpath + +/* Setting classpathes, options and arguments */ +envset = _getenv_('envset') +if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"' +if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"' +if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"' +if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"' + +exit 0 + +addpath: procedure +parse arg path elem +if elem = '' then do + if path\='' & right(path, 1)\=';' then path = path || ';' + return path +end +if substr(path, length(path)) = ';' then glue = '' +else glue = ';' +if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';' +return path + +prepend: procedure +parse arg path elem +if elem = '' then do + if path\='' & right(path, 1)\=';' then path = path || ';' + return path +end +if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path +return path + +_getenv_: procedure expose env +parse arg envar default +if default = '' then default = envar +var = value(translate(envar),,env) +if var = '' then var = default +return var Added: trunk/build/tools/ant/bin/complete-ant-cmd.pl =================================================================== --- trunk/build/tools/ant/bin/complete-ant-cmd.pl (rev 0) +++ trunk/build/tools/ant/bin/complete-ant-cmd.pl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,114 @@ +#!/usr/bin/perl +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# A script to allow Bash or Z-Shell to complete an Ant command-line. +# +# To install for Bash 2.0 or better, add the following to ~/.bashrc: +# +# $ complete -C complete-ant-cmd ant build.sh +# +# To install for Z-Shell 2.5 or better, add the following to ~/.zshrc: +# +# function ant_complete () { +# local args_line args +# read -l args_line +# set -A args $args_line +# set -A reply $(COMP_LINE=$args_line complete-ant-cmd ${args[1]} $1) +# } +# compctl -K ant_complete ant build.sh +# +# @author Mike Williams <mikew(a)cortexebusiness.com.au> + +my $cmdLine = $ENV{'COMP_LINE'}; +my $antCmd = $ARGV[0]; +my $word = $ARGV[1]; + +my @completions; +if ($word =~ /^-/) { + list( restrict( $word, getArguments() )); +} elsif ($cmdLine =~ /-(f|buildfile)\s+\S*$/) { + list( getBuildFiles($word) ); +} else { + list( restrict( $word, getTargets() )); +} + +exit(0); + +sub list { + for (@_) { + print "$_\n"; + } +} + +sub restrict { + my ($word, @completions) = @_; + grep( /^\Q$word\E/, @completions ); +} + +sub getArguments { + qw(-buildfile -debug -emacs -f -find -help -listener -logfile + -logger -projecthelp -quiet -verbose -version); +} + + +sub getBuildFiles { + my ($word) = @_; + grep( /\.xml$/, glob( "$word*" )); +} + +sub getTargets { + + # Look for build-file + my $buildFile = 'build.xml'; + if ($cmdLine =~ /-(f|buildfile)\s+(\S+)/) { + $buildFile = $2; + } + return () unless (-f $buildFile); + + # Run "ant -projecthelp" to list targets. Keep a cache of results in a + # cache-file. + my $cacheFile = $buildFile; + $cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|; + if ((!-e $cacheFile) || (-M $buildFile) < (-M $cacheFile)) { + open( CACHE, '>'.$cacheFile ) || die "can\'t write $cacheFile: $!\n"; + open( HELP, "$antCmd -projecthelp -f '$buildFile'|" ) || return(); + my %targets; + while( <HELP> ) { + if (/^\s+(\S+)/) { + $targets{$1}++; + } + } + my @targets = sort keys %targets; + for (@targets) { print CACHE "$_\n"; } + return @targets; + } + + # Read the target-cache + open( CACHE, $cacheFile ) || die "can\'t read $cacheFile: $!\n"; + my @targets; + while (<CACHE>) { + chop; + s/\r$//; # for Cygwin + push( @targets, $_ ); + } + close( CACHE ); + @targets; + +} + + + Property changes on: trunk/build/tools/ant/bin/complete-ant-cmd.pl ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/tools/ant/bin/envset.cmd =================================================================== --- trunk/build/tools/ant/bin/envset.cmd (rev 0) +++ trunk/build/tools/ant/bin/envset.cmd 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,131 @@ +/* + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +SET environment variables +First optional parameter: + ; parameters are considered parts of a path variable, semicolons are + appended to each element if not already present + -D parameters are properties for Java or Makefile etc., -D will be + prepended and the parameters will be separated by a space + =D the same as above but equal sign is not required + , parameters should be comma separated in the environment variable + - parameters should be separated by the next parameter + Other values mean that the first parameter is missing and the environment + variable will be set to the space separated parameters + +Second parameter: name of the environment variable + +Next parameters: values +; implies that the equal sign is considered a part of the parameter and is +not interpreted + +-D requires parameters in the form name=value. If the equal sign is not found, +the parameters are changed to name=expanded_name + +Other options have optional equal sign. If it is found, only the part after +the equal sign will be oprionally expanded. + +If the parameter is the minus sign, the next parameter will not be expanded. +If the parameter is a single dot, it will be replaced with the value of the +environment variable as it existed before envset was invoked. + +For other parameters the batch looks for the environment variable with the +same name (in uppercase). If it is found, it forms the expanded_name. If +the environment variable with such a name does not exist, the expanded_name +will hold the parameter name without case conversion. +*/ + +parse arg mode envar args + +equal = 0 +sep = ' ' + +/* Parse command line parameters */ +select + when mode='-' then do + sep = envar + parse var args envar args + end + when mode=';' then do + sep = '' + equal = -1 + end + when mode='-D' then equal = 1 + when mode='=D' then mode = '-D' + when mode=',' then sep = ',' +otherwise + args = envar args + envar = mode + mode = '' +end + +env = 'OS2ENVIRONMENT' +envar = translate(envar) +orig = value(envar,,env) +newval = '' +expand = 1 + +/* for each parameter... */ +do i = 1 to words(args) + if expand > 0 & word(args, i) = '-' then expand = 0 + else call addval word(args, i) +end + +/* Optionally enclose path variable by quotes */ +if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"' + +/* Set the new value, 'SET' cannot be used since it does not allow '=' */ +x = value(envar, newval, env) +exit 0 + +addval: procedure expose sep equal orig expand newval mode env +parse arg var + +if var = '.' then expvar = orig +else do + if equal >= 0 then do + parse var var name '=' val + if val = '' then var = name + else var = val + end + if expand = 0 then expvar = var + else expvar = value(translate(var),,env) + if expvar = '' then expvar = var + if equal >= 0 then do + if val = '' then do + parse var expvar key '=' val + if val <> '' then name = key + else do + if equal > 0 then val = key + else name = key + end + end + else val = expvar + if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"' + if val = '' then expvar = name + else expvar = name || '=' || val + end + if mode = '-D' then expvar = '-D' || expvar + if mode = ';' then do + if right(expvar, 1) <> ';' then expvar = expvar || ';' + end +end + +if newval = '' then newval = expvar +else newval = newval || sep || expvar +expand = 1 +return Added: trunk/build/tools/ant/bin/lcp.bat =================================================================== --- trunk/build/tools/ant/bin/lcp.bat (rev 0) +++ trunk/build/tools/ant/bin/lcp.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,31 @@ +REM +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM +REM + +set _CLASSPATHCOMPONENT=%1 +if ""%1""=="""" goto gotAllArgs +shift + +:argCheck +if ""%1""=="""" goto gotAllArgs +set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1 +shift +goto argCheck + +:gotAllArgs +set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT% + Added: trunk/build/tools/ant/bin/runant.pl =================================================================== --- trunk/build/tools/ant/bin/runant.pl (rev 0) +++ trunk/build/tools/ant/bin/runant.pl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,153 @@ +#!/usr/bin/perl +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +####################################################################### +# +# runant.pl +# +# wrapper script for invoking ant in a platform with Perl installed +# this may include cgi-bin invocation, which is considered somewhat daft. +# (slo: that should be a separate file which can be derived from this +# and returns the XML formatted output) +# +# the code is not totally portable due to classpath and directory splitting +# issues. oops. (NB, use File::Spec::Functions will help and the code is +# structured for the catfile() call, but because of perl version funnies +# the code is not included. +# +# created: 2000-8-24 +# author: Steve Loughran steve_l(a)sourceforge.net +####################################################################### +# +# Assumptions: +# +# - the "java" executable/script is on the command path +# - ANT_HOME has been set +# - target platform uses ":" as classpath separator or perl indicates it is dos/win32 +# - target platform uses "/" as directory separator. + +#be fussy about variables +use strict; + +#platform specifics (disabled) +#use File::Spec::Functions; + +#turn warnings on during dev; generates a few spurious uninitialised var access warnings +#use warnings; + +#and set $debug to 1 to turn on trace info +my $debug=1; + +####################################################################### +# +# check to make sure environment is setup +# + +my $HOME = $ENV{ANT_HOME}; +if ($HOME eq "") + { + die "\n\nANT_HOME *MUST* be set!\n\n"; + } + +my $JAVACMD = $ENV{JAVACMD}; +$JAVACMD = "java" if $JAVACMD eq ""; + +my $onnetware = 0; +if ($^O eq "NetWare") +{ + $onnetware = 1; +} + +my $oncygwin = ($^O eq "cygwin"); + +#ISSUE: what java wants to split up classpath varies from platform to platform +#and perl is not too hot at hinting which box it is on. +#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed. +my $s=":"; +if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin") || + ($onnetware == 1)) + { + $s=";"; + } + +#build up standard classpath +my $localpath = "$HOME/lib/ant-launcher.jar"; +#set JVM options and Ant arguments, if any +my @ANT_OPTS=split(" ", $ENV{ANT_OPTS}); +my @ANT_ARGS=split(" ", $ENV{ANT_ARGS}); + +#jikes +if($ENV{JIKESPATH} ne "") + { + push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}"; + } + +#construct arguments to java +my @ARGS; +push @ARGS, @ANT_OPTS; + +my $CYGHOME = ""; + +my $classpath=$ENV{CLASSPATH}; +if ($oncygwin == 1) { + $localpath = `cygpath --path --windows $localpath`; + chomp ($localpath); + if (! $classpath eq "") + { + $classpath = `cygpath --path --windows "$classpath"`; + chomp ($classpath); + } + $HOME = `cygpath --path --windows $HOME`; + chomp ($HOME); + $CYGHOME = `cygpath --path --windows $ENV{HOME}`; + chomp ($CYGHOME); +} +push @ARGS, "-classpath", "$localpath"; +push @ARGS, "-Dant.home=$HOME"; +if ( ! $CYGHOME eq "" ) +{ + push @ARGS, "-Dcygwin.user.home=\"$CYGHOME\"" +} +push @ARGS, "org.apache.tools.ant.launch.Launcher", @ANT_ARGS; +push @ARGS, @ARGV; +if (! $classpath eq "") +{ + if ($onnetware == 1) + { + # make classpath literally $CLASSPATH + # this is to avoid pushing us over the 512 character limit + # even skip the ; - that is already in $localpath + push @ARGS, "-lib", "\$CLASSPATH"; + } + else + { + push @ARGS, "-lib", "$classpath"; + } +} +print "\n $JAVACMD @ARGS\n\n" if ($debug); + +my $returnValue = system $JAVACMD, @ARGS; +if ($returnValue eq 0) + { + exit 0; + } +else + { + # only 0 and 1 are widely recognized as exit values + # so change the exit value to 1 + exit 1; + } Property changes on: trunk/build/tools/ant/bin/runant.pl ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/tools/ant/bin/runant.py =================================================================== --- trunk/build/tools/ant/bin/runant.py (rev 0) +++ trunk/build/tools/ant/bin/runant.py 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,102 @@ +#!/usr/bin/python +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +""" + + runant.py + + This script is a translation of the runant.pl written by Steve Loughran. + It runs ant with/out arguments, it should be quite portable (thanks to + the python os library) + This script has been tested with Python2.0/Win2K + + created: 2001-04-11 + author: Pierre Dittgen pierre.dittgen(a)criltelecom.com + + Assumptions: + + - the "java" executable/script is on the command path +""" +import os, os.path, string, sys + +# Change it to 1 to get extra debug information +debug = 0 + +####################################################################### + +# If ANT_HOME is not set default to script's parent directory +if os.environ.has_key('ANT_HOME'): + ANT_HOME = os.environ['ANT_HOME'] +else: + ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))) + +# set ANT_LIB location +ANT_LIB = os.path.join(ANT_HOME, 'lib') + +# set JAVACMD (check variables JAVACMD and JAVA_HOME) +JAVACMD = None +if not os.environ.has_key('JAVACMD'): + if os.environ.has_key('JAVA_HOME'): + if not os.path.exists(os.environ['JAVA_HOME']): + print "Warning: JAVA_HOME is not defined correctly." + else: + JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java') + else: + print "Warning: JAVA_HOME not set." +else: + JAVACMD = os.environ['JAVACMD'] +if not JAVACMD: + JAVACMD = 'java' + +launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar') +if not os.path.exists(launcher_jar): + print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \ + ANT_LIB + +# Build up standard classpath (LOCALCLASSPATH) +LOCALCLASSPATH = launcher_jar +if os.environ.has_key('LOCALCLASSPATH'): + LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH'] + +ANT_OPTS = "" +if os.environ.has_key('ANT_OPTS'): + ANT_OPTS = os.environ['ANT_OPTS'] + +OPTS = "" +if os.environ.has_key('JIKESPATH'): + OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH'] + +ANT_ARGS = "" +if os.environ.has_key('ANT_ARGS'): + ANT_ARGS = os.environ['ANT_ARGS'] + +CLASSPATH = "" +if os.environ.has_key('CLASSPATH'): + CLASSPATH = os.environ['CLASSPATH'] + +# Builds the commandline +cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \ + 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \ + % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \ + CLASSPATH, string.join(sys.argv[1:], ' ')) + +if debug: + print '\n%s\n\n' % (cmdline) +sys.stdout.flush() + +# Run the biniou! +os.system(cmdline) Property changes on: trunk/build/tools/ant/bin/runant.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/build/tools/ant/bin/runrc.cmd =================================================================== --- trunk/build/tools/ant/bin/runrc.cmd (rev 0) +++ trunk/build/tools/ant/bin/runrc.cmd 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,60 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Run RC file, name is in the first arg, second arg is either PATH + ENV or -r or nothing +*/ + +parse arg name path rest + +if name = '' then do + say 'RC file name is missing' + exit 1 +end + +if rest \= '' then do + say 'Too many parameters' + exit 1 +end + +call runit name path +exit 0 + +runit: procedure +parse arg name path dir + +if path \= '' & path \= '-r' then do + dir = value(translate(path),,'OS2ENVIRONMENT') + if dir = '' then return + dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */ +end + +if dir = '' then dir = directory() + +if path = '-r' then do /* recursive call */ + subdir = filespec('path', dir) + if subdir \= '\' then do + subdir = left(subdir, length(subdir)-1) + call runit name path filespec('drive', dir) || subdir + end +end + +/* Look for the file and run it */ +if right(dir, 1) \= '\' then dir = dir || '\' +rcfile = stream(dir || name, 'c', 'query exists') +if rcfile \= '' then interpret 'call "' || rcfile || '"' + +return Added: trunk/build/tools/ant/endorsed/jaxb-api.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/endorsed/jaxb-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/endorsed/jaxws-api.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/endorsed/jaxws-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/etc/ant-bootstrap.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/etc/ant-bootstrap.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/etc/changelog.xsl =================================================================== --- trunk/build/tools/ant/etc/changelog.xsl (rev 0) +++ trunk/build/tools/ant/etc/changelog.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xsl:stylesheet + xmlns:xsl='http://www.w3.org/1999/XSL/Transform' + version='1.0'> + + + <xsl:param name="title"/> + <xsl:param name="module"/> + <xsl:param name="cvsweb"/> + + <xsl:output method="html" indent="yes" encoding="US-ASCII" + doctype-public="-//W3C//DTD HTML 4.01//EN" + doctype-system="http://www.w3.org/TR/html401/strict.dtd"/> + +  + <xsl:template match="*"> + <xsl:copy> + <xsl:copy-of select="attribute::*[. != '']"/> + <xsl:apply-templates/> + </xsl:copy> + </xsl:template> + + <xsl:template match="changelog"> + <html> + <head> + <title><xsl:value-of select="$title"/></title> + <style type="text/css"> + body, p { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 80%; + color: #000000; + background-color: #ffffff; + } + tr, td { + font-family: Verdana, Arial, Helvetica, sans-serif; + background: #eeeee0; + } + td { + padding-left: 20px; + } + .dateAndAuthor { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold; + text-align: left; + background: #a6caf0; + padding-left: 3px; + } + a { + color: #000000; + } + pre { + font-weight: bold; + } + </style> + </head> + <body> + <h1> + <a name="top"><xsl:value-of select="$title"/></a> + </h1> + <p style="text-align: right">Designed for use with <a href="http://ant.apache.org/">Apache Ant</a>.</p> + <hr/> + <table border="0" width="100%" cellspacing="1"> + + <xsl:apply-templates select=".//entry"> + <xsl:sort select="date" data-type="text" order="descending"/> + <xsl:sort select="time" data-type="text" order="descending"/> + </xsl:apply-templates> + + </table> + + </body> + </html> + </xsl:template> + + <xsl:template match="entry"> + <tr> + <td class="dateAndAuthor"> + <xsl:value-of select="date"/><xsl:text> </xsl:text><xsl:value-of select="time"/><xsl:text> </xsl:text><xsl:value-of select="author"/> + </td> + </tr> + <tr> + <td> + <pre> +<xsl:apply-templates select="msg"/></pre> + <ul> + <xsl:apply-templates select="file"/> + </ul> + </td> + </tr> + </xsl:template> + + <xsl:template match="date"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="time"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="author"> + <i> + <a> + <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute> + <xsl:value-of select="."/></a> + </i> + </xsl:template> + + <xsl:template match="file"> + <li> + <a> + <xsl:choose> + <xsl:when test="string-length(prevrevision) = 0 "> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/></xsl:attribute> + </xsl:otherwise> + </xsl:choose> + <xsl:value-of select="name" /> (<xsl:value-of select="revision"/>)</a> + </li> + </xsl:template> + +  + <xsl:template match="msg"> + <xsl:apply-templates/> + </xsl:template> + +</xsl:stylesheet> Added: trunk/build/tools/ant/etc/checkstyle/checkstyle-frames.xsl =================================================================== --- trunk/build/tools/ant/etc/checkstyle/checkstyle-frames.xsl (rev 0) +++ trunk/build/tools/ant/etc/checkstyle/checkstyle-frames.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,293 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> + + + + <xsl:output method="html" indent="yes" encoding="US-ASCII"/> + <xsl:decimal-format decimal-separator="." grouping-separator="," /> + + <xsl:param name="output.dir" select="'.'"/> + <xsl:param name="basedir" select="'.'"/> + + <xsl:template match="checkstyle"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="overview"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:apply-templates select="file[count(error) != 0]"/> + </xsl:template> + + <xsl:template name="index.html"> + <html> + <head> + <title>CheckStyle Audit</title> + </head> + <frameset cols="20%,80%"> + <frame src="allclasses-frame.html" name="fileListFrame"/> + <frame src="overview-frame.html" name="fileFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. + If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> + </html> + </xsl:template> + + <xsl:template name="pageHeader"> + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="text-align:right"><h2>CheckStyle Audit</h2></td> + </tr> + <tr> + <td class="text-align:right">Designed for use with + <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and + <a href='http://ant.apache.org/'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> + </xsl:template> + + <xsl:template match="checkstyle" mode="overview"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> +  + <xsl:call-template name="pageHeader"/> + +  + <xsl:apply-templates select="." mode="summary"/> + <hr size="1" width="100%" align="left"/> + +  + <xsl:apply-templates select="." mode="filelist"/> + </body> + </html> + </xsl:template> + + <xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .oddrow td { + background: #efefef; + } + .evenrow td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } + </xsl:template> + +  + <xsl:template match="checkstyle" mode="all.classes"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <h2>Files</h2> + <p> + <table width="100%"> +  + <xsl:apply-templates select="file[count(error) != 0]" mode="all.classes"> + <xsl:sort select="substring-after(@name, $basedir)"/> + </xsl:apply-templates> + </table> + </p> + </body> + </html> + </xsl:template> + + <xsl:template match="checkstyle" mode="filelist"> + <h3>Files</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Name</th> + <th>Errors</th> + </tr> + <xsl:apply-templates select="file[count(error) != 0]" mode="filelist"> + <xsl:sort select="count(error)" order="descending" data-type="number"/> + </xsl:apply-templates> + </table> + </xsl:template> + + <xsl:template match="file" mode="filelist"> + <tr> + <xsl:call-template name="alternated-row"/> + <td nowrap="nowrap"> + <a> + <xsl:attribute name="href"> + <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="substring-after(@name, $basedir)"/> + </a> + </td> + <td><xsl:value-of select="count(error)"/></td> + </tr> + </xsl:template> + + <xsl:template match="file" mode="all.classes"> + <tr> + <td nowrap="nowrap"> + <a target="fileFrame"> + <xsl:attribute name="href"> + <xsl:text>files/</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="substring-after(@name, $basedir)"/> + </a> + </td> + </tr> + </xsl:template> + +  + <xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'/')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'/')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'/')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> + </xsl:template> + + <xsl:template match="file"> + <redirect:write file="{$output.dir}/files/{substring-after(@name, $basedir)}.html"> + <html> + <head> + <link rel="stylesheet" type="text/css"> + <xsl:attribute name="href"><xsl:call-template name="path"><xsl:with-param name="path" select="substring-after(@name, $basedir)"/></xsl:call-template><xsl:text>stylesheet.css</xsl:text></xsl:attribute> + </link> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <h3>File <xsl:value-of select="substring-after(@name, $basedir)"/></h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Error Description</th> + <th>Line:Column</th> + </tr> + <xsl:for-each select="error"> + <tr> + <xsl:call-template name="alternated-row"/> + <td><a title="{@source}"><xsl:value-of select="@message"/></a></td> + <td align="center"><xsl:value-of select="@line"/><xsl:if test="@column">:<xsl:value-of select="@column"/></xsl:if></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> + </redirect:write> + </xsl:template> + + <xsl:template match="checkstyle" mode="summary"> + <h3>Summary</h3> + <xsl:variable name="fileCount" select="count(file)"/> + <xsl:variable name="errorCount" select="count(file/error)"/> + <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Total Files</th> + <th>Files With Errors</th> + <th>Errors</th> + </tr> + <tr> + <xsl:call-template name="alternated-row"/> + <td><xsl:value-of select="$fileCount"/></td> + <td><xsl:value-of select="$fileErrorCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + </tr> + </table> + </xsl:template> + + <xsl:template name="alternated-row"> + <xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">oddrow</xsl:if> + <xsl:if test="position() mod 2 = 0">evenrow</xsl:if> + </xsl:attribute> + </xsl:template> +</xsl:stylesheet> \ No newline at end of file Added: trunk/build/tools/ant/etc/checkstyle/checkstyle-text.xsl =================================================================== --- trunk/build/tools/ant/etc/checkstyle/checkstyle-text.xsl (rev 0) +++ trunk/build/tools/ant/etc/checkstyle/checkstyle-text.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,33 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + + + <xsl:strip-space elements="checkstyle"/> + <xsl:preserve-space elements="file"/> + <xsl:output method="text"/> + <xsl:template match="checkstyle/file/error"> + <xsl:value-of select="../@name"/> + <xsl:text>:</xsl:text> + <xsl:value-of select="@line"/> + <xsl:text>:</xsl:text> + <xsl:value-of select="@column"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@message"/> + </xsl:template> +</xsl:stylesheet> + Added: trunk/build/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl =================================================================== --- trunk/build/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl (rev 0) +++ trunk/build/tools/ant/etc/checkstyle/checkstyle-xdoc.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,129 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> + + + + <xsl:output method="xml" indent="yes"/> + <xsl:decimal-format decimal-separator="." grouping-separator="," /> + + <xsl:param name="output.dir" select="'.'"/> + <xsl:param name="basedir" select="'.'"/> + + <xsl:template match="checkstyle"> + <document> + <properties> + <title>Checkstyle Audit</title> + </properties> + + <body> + <xsl:apply-templates select="." mode="summary"/> +  + <xsl:apply-templates select="." mode="filelist"/> + <xsl:apply-templates select="file[count(error) != 0]"/> + </body> + </document> + </xsl:template> + + <xsl:template match="checkstyle" mode="filelist"> + <section name="Files"> + <table> + <tr> + <th>Name</th> + <th>Errors</th> + </tr> + <xsl:apply-templates select="file[count(error) != 0]" mode="filelist"> + <xsl:sort select="count(error)" order="descending" data-type="number"/> + </xsl:apply-templates> + </table> + </section> + </xsl:template> + + <xsl:template match="file" mode="filelist"> + <tr> + <xsl:call-template name="alternated-row"/> + <td nowrap="nowrap"> + <a> + <xsl:attribute name="href"> + <xsl:text>files</xsl:text><xsl:value-of select="substring-after(@name, $basedir)"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="substring-after(@name, $basedir)"/> + </a> + </td> + <td><xsl:value-of select="count(error)"/></td> + </tr> + </xsl:template> + + <xsl:template match="file"> + <redirect:write file="{$output.dir}/files{substring-after(@name, $basedir)}.xml"> + <document> + <properties> + <title>Checkstyle Audit</title> + </properties> + + <body> + <section name="Details for {substring-after(@name, $basedir)}"> + <table> + <tr> + <th>Error Description</th> + <th>Line</th> + </tr> + <xsl:for-each select="error"> + <tr> + <xsl:call-template name="alternated-row"/> + <td><a title="{@source}"><xsl:value-of select="@message"/></a></td> + <td><xsl:value-of select="@line"/></td> + </tr> + </xsl:for-each> + </table> + </section> + </body> + </document> + </redirect:write> + </xsl:template> + + <xsl:template match="checkstyle" mode="summary"> + <section name="Summary"> + <xsl:variable name="fileCount" select="count(file)"/> + <xsl:variable name="errorCount" select="count(file/error)"/> + <xsl:variable name="fileErrorCount" select="count(file[count(error) != 0])"/> + <table> + <tr> + <th>Files</th> + <th>Files With Errors</th> + <th>Errors</th> + </tr> + <tr> + <xsl:call-template name="alternated-row"/> + <td><xsl:value-of select="$fileCount"/></td> + <td><xsl:value-of select="$fileErrorCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + </tr> + </table> + </section> + </xsl:template> + + <xsl:template name="alternated-row"> + <xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">oddrow</xsl:if> + <xsl:if test="position() mod 2 = 0">evenrow</xsl:if> + </xsl:attribute> + </xsl:template> +</xsl:stylesheet> + Added: trunk/build/tools/ant/etc/coverage-frames.xsl =================================================================== --- trunk/build/tools/ant/etc/coverage-frames.xsl (rev 0) +++ trunk/build/tools/ant/etc/coverage-frames.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,488 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes"/> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + + + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:template match="/snapshot"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:apply-templates select="./package" mode="write"/> +</xsl:template> + + +<xsl:template name="index.html"> +<html> + <head><title>Coverage Results.</title></head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="overview-frame.html" name="packageListFrame"/> + <frame src="allclasses-frame.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> +</html> +</xsl:template> + + + +<xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } +</xsl:template> + + +<xsl:template match="snapshot" mode="all.classes"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"/> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="package/class"> + <xsl:sort select="@name"/> + <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/> + <xsl:variable name="link"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:variable> + <tr> + <td nowrap="nowrap"> + <a target="classFrame" href="{$link}"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template match="snapshot" mode="all.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"/> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:for-each select="package"> + <xsl:sort select="@name" order="ascending"/> + <tr> + <td nowrap="nowrap"> + <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template match="snapshot" mode="overview.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"/> + </head> + <body onload="open('allclasses-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Summary</h3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <tr> +  + <th width="10%" nowrap="nowrap">Reported Classes</th> + <th width="10%" nowrap="nowrap">Methods Hit</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> + <tr class="a"> +  + <td><xsl:value-of select="count(package/class)"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td> + </tr> + </table> + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + To ensure accurate test runs on Java applications, developers need to know how much of + the code has been tested, and where to find any untested code. Coverage helps you + locate untested code, and measure precisely how much code has been exercised. + The result is a higher quality application in a shorter period of time. + <p/> + </td> + </tr> + </table> + + <h3>Packages</h3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="package[1]" mode="stats.header"/> +  + <xsl:for-each select="package"> + <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{translate(@name,'.','/')}/package-summary.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td> + </tr> + </xsl:for-each> + </table> + <xsl:call-template name="pageFooter"/> + </body> + </html> +</xsl:template> + + +<xsl:template match="package" mode="write"> + <xsl:variable name="package.dir"> + <xsl:if test="not(@name = '')"><xsl:value-of select="translate(@name,'.','/')"/></xsl:if> + <xsl:if test="@name = ''">.</xsl:if> + </xsl:variable> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:apply-templates select="." mode="classes.list"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:apply-templates select="." mode="package.summary"/> + </redirect:write> + +  + <xsl:for-each select="class"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + </xsl:for-each> +</xsl:template> + + +<xsl:template match="package" mode="classes.list"> + <html> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> + <BODY> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2> + </td> + </tr> + </table> + + <H2>Classes</H2> + <TABLE WIDTH="100%"> + <xsl:for-each select="class"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </TABLE> + </BODY> + </html> +</xsl:template> + + +<xsl:template match="package" mode="package.summary"> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> +  + <BODY onload="open('package-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="@name"/></h3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="." mode="stats.header"/> + <xsl:apply-templates select="." mode="stats"/> + </table> + + <xsl:if test="count(class) > 0"> + <H3>Classes</H3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="." mode="stats.header"/> + <xsl:apply-templates select="class" mode="stats"> + <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/> + </xsl:apply-templates> + </table> + </xsl:if> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + +<xsl:template match="class" mode="class.details"> + <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:call-template name="pageHeader"/> + <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3> + +  + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="." mode="stats.header"/> + <xsl:apply-templates select="." mode="stats"/> + </table> + +  + <H3>Methods</H3> + <table class="log" cellpadding="5" cellspacing="2" width="100%"> + <xsl:apply-templates select="method[1]" mode="stats.header"/> + <xsl:apply-templates select="method" mode="stats"> + <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/> + </xsl:apply-templates> + </table> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> + +</xsl:template> + + +<xsl:template name="pageHeader"> +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="bannercell" rowspan="2"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right"><h2>Source Code Coverage</h2></td> + </tr> + <tr> + <td style="text-align:right">Designed for use with <a href='http://www.sitraka.com/jprobe'>Sitraka JProbe</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="pageFooter"> +</xsl:template> + + +<xsl:template name="table.header"> + <tr> + <th width="80%">Name</th> + <th width="10%" nowrap="nowrap">Methods Hit</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> +</xsl:template> + +<xsl:template match="method" mode="stats.header"> + <tr> + <th width="90%">Name</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> +</xsl:template> +<xsl:template match="method" mode="stats"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:value-of select="@name"/></td> + <td> + <xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/> + </td> + </tr> +</xsl:template> + +<xsl:template match="package|class" mode="stats.header"> + <tr> + <th width="80%">Name</th> + <th width="10%" nowrap="nowrap">Methods Hit</th> + <th width="10%" nowrap="nowrap">Lines Hit</th> + </tr> +</xsl:template> +<xsl:template match="package|class" mode="stats"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:value-of select="@name"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td> + <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td> + </tr> +</xsl:template> + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK> +</xsl:template> + + +<xsl:template name="alternate-row"> +<xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> +</xsl:attribute> +</xsl:template> + +</xsl:stylesheet> + + Added: trunk/build/tools/ant/etc/jdepend-frames.xsl =================================================================== --- trunk/build/tools/ant/etc/jdepend-frames.xsl (rev 0) +++ trunk/build/tools/ant/etc/jdepend-frames.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,486 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> + + +<xsl:param name="output.dir" select="'.'"/> + +<xsl:template match="JDepend"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-packages.html"> + <xsl:apply-templates select="." mode="packages.details"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-cycles.html"> + <xsl:apply-templates select="." mode="cycles.details"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-explanations.html"> + <xsl:apply-templates select="." mode="explanations"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/all-packages.html"> + <xsl:apply-templates select="Packages" mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/all-cycles.html"> + <xsl:apply-templates select="Cycles" mode="all.cycles"/> + </redirect:write> +</xsl:template> + + +<xsl:template name="index.html"> +<html> + <head> + <title>JDepend Analysis</title> + </head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="all-packages.html" name="packageListFrame"/> + <frame src="all-cycles.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> + <style type="text/css"> + body { + font:normal 68% verdana,arial,helvetica; + color:#000000; + } + table tr td, tr th { + font-size: 68%; + } + table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; + } + table.details tr td{ + background:#eeeee0; + } + + p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; + margin-left:2em; + margin-right:2em; + } + h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica + } + h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica + } + h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica + } + h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + .Error { + font-weight:bold; color:red; + } + .Failure { + font-weight:bold; color:purple; + } + .Properties { + text-align:right; + } + </style> +</xsl:template> + +<xsl:template match="JDepend" mode="overview.packages"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <table width="100%"><tr align="left"><h2>Summary</h2><td> + </td><td align="right"> + [summary] + [<a href="overview-packages.html">packages</a>] + [<a href="overview-cycles.html">cycles</a>] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + <table width="100%" class="details"> + <tr> + <th>Package</th> + <th>Total Classes</th> + <th><a href="overview-explanations.html#EXnumber">Abstract Classes</a></th> + <th><a href="overview-explanations.html#EXnumber">Concrete Classes</a></th> + <th><a href="overview-explanations.html#EXafferent">Afferent Couplings</a></th> + <th><a href="overview-explanations.html#EXefferent">Efferent Couplings</a></th> + <th><a href="overview-explanations.html#EXabstractness">Abstractness</a></th> + <th><a href="overview-explanations.html#EXinstability">Instability</a></th> + <th><a href="overview-explanations.html#EXdistance">Distance</a></th> + + </tr> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <tr> + <td align="left"> + <a> + <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="@name"/> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td> + <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td> + <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td> + <td align="right"><xsl:value-of select="Stats/Ca"/></td> + <td align="right"><xsl:value-of select="Stats/Ce"/></td> + <td align="right"><xsl:value-of select="Stats/A"/></td> + <td align="right"><xsl:value-of select="Stats/I"/></td> + <td align="right"><xsl:value-of select="Stats/D"/></td> + </tr> + </xsl:if> + </xsl:for-each> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) > 0"> + <tr> + <td align="left"> + <xsl:value-of select="@name"/> + </td> + <td align="left" colspan="8"><xsl:value-of select="error"/></td> + </tr> + </xsl:if> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend" mode="packages.details"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <table width="100%"><tr align="left"><h2>Packages</h2><td> + </td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [packages] + [<a href="overview-cycles.html">cycles</a>] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute> + <xsl:value-of select="@name"/></a></h3> + + <table width="100%"><tr> + <td><a href="overview-explanations.html#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td> + <td><a href="overview-explanations.html#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td> + <td><a href="overview-explanations.html#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td> + <td><a href="overview-explanations.html#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td> + <td><a href="overview-explanations.html#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td> + </tr></table> + + <table width="100%" class="details"> + <tr> + <th>Abstract Classes</th> + <th>Concrete Classes</th> + <th>Used by Packages</th> + <th>Uses Packages</th> + </tr> + <tr> + <td valign="top" width="25%"> + <xsl:if test="count(AbstractClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="AbstractClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(ConcreteClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="ConcreteClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(UsedBy/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="UsedBy/Package"> + <a> + <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(DependsUpon/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="DependsUpon/Package"> + <a> + <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + </tr> + </table> + </xsl:if> + </xsl:for-each> +  + <table width="100%"><tr align="left"><td></td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [packages] + [<a href="overview-cycles.html">cycles</a>] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend" mode="cycles.details"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <table width="100%"><tr align="left"><h2>Cycles</h2><td> + </td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [<a href="overview-packages.html">packages</a>] + [cycles] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> +  + + <xsl:if test="count(Cycles/Package) = 0"> + <p>There are no cyclic dependancies.</p> + </xsl:if> + <xsl:for-each select="Cycles/Package"> + <h3><a><xsl:attribute name="name">#CY<xsl:value-of select="@Name"/></xsl:attribute><xsl:value-of select="@Name"/></a></h3><p> + <xsl:for-each select="Package"> + <xsl:value-of select="."/><br/> + </xsl:for-each></p> + </xsl:for-each> +  + <table width="100%"><tr align="left"><td></td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [<a href="overview-packages.html">packages</a>] + [cycles] + [<a href="overview-explanations.html">explanations</a>] + </td></tr></table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend" mode="explanations"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <xsl:call-template name="pageHeader"/> + + <table width="100%"><tr align="left"><h2>Explanations</h2><td> + </td><td align="right"> + [<a href="overview-summary.html">summary</a>] + [<a href="overview-packages.html">packages</a>] + [<a href="overview-cycles.html">cycles</a>] + [explanations] + </td></tr></table> + + <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p> + + <h3><a name="EXnumber">Number of Classes</a></h3> + <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p> + <h3><a name="EXafferent">Afferent Couplings</a></h3> + <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p> + <h3><a name="EXefferent">Efferent Couplings</a></h3> + <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p> + <h3><a name="EXabstractness">Abstractness</a></h3> + <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p> + <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p> + <h3><a name="EXinstability">Instability</a></h3> + <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p> + <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p> + <h3><a name="EXdistance">Distance</a></h3> + <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p> + <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p> + <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p> + + </body> + </html> +</xsl:template> + + + +<xsl:template match="JDepend/Packages" mode="all.packages"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right"> + [<a href="overview-summary.html" target="classFrame">summary</a>] + [<a href="overview-packages.html" target="classFrame">packages</a>] + [<a href="overview-cycles.html" target="classFrame">cycles</a>] + [<a href="overview-explanations.html" target="classFrame">explanations</a>] + </td></tr></table> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="Package[count(error)=0]" mode="all.packages.link"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + <xsl:apply-templates select="Package[count(error) > 0]" mode="all.packages.nolink"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend/Packages/Package" mode="all.packages.link"> + <tr> + <td nowrap="nowrap"> + <a href="overview-packages.html#PK{@name}" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="JDepend/Packages/Package" mode="all.packages.nolink"> + <tr> + <td nowrap="nowrap"> + Not Analyzed: <xsl:value-of select="@name"/> + </td> + </tr> +</xsl:template> + + +<xsl:template match="JDepend/Cycles" mode="all.cycles"> + <html> + <head> + <link rel="stylesheet" type="text/css" href="stylesheet.css"/> + </head> + <body> + <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right"> + [<a href="overview-summary.html" target="classFrame">summary</a>] + [<a href="overview-packages.html" target="classFrame">packages</a>] + [<a href="overview-cycles.html" target="classFrame">cycles</a>] + [<a href="overview-explanations.html" target="classFrame">explanations</a>] + </td></tr></table> + <h2>Cycles</h2> + <table width="100%"> + <xsl:apply-templates select="Package" mode="all.cycles"> + <xsl:sort select="@Name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="JDepend/Cycles/Package" mode="all.cycles"> + <tr> + <td nowrap="nowrap"> + <a href="overview-cycles.html#CY{@Name}" target="classFrame"><xsl:value-of select="@Name"/></a> + </td> + </tr> +</xsl:template> + + +<xsl:template name="pageHeader"> + <h1>JDepend Analysis</h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + +</xsl:stylesheet> Added: trunk/build/tools/ant/etc/jdepend.xsl =================================================================== --- trunk/build/tools/ant/etc/jdepend.xsl (rev 0) +++ trunk/build/tools/ant/etc/jdepend.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,275 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + + +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> + +<xsl:template match="JDepend"> + <html> + <head> + <title>JDepend Analysis</title> + + <style type="text/css"> + body { + font:normal 68% verdana,arial,helvetica; + color:#000000; + } + table tr td, tr th { + font-size: 68%; + } + table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; + } + table.details tr td{ + background:#eeeee0; + } + + p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; + margin-left:2em; + margin-right:2em; + } + h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica + } + h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica + } + h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica + } + h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + .Error { + font-weight:bold; color:red; + } + .Failure { + font-weight:bold; color:purple; + } + .Properties { + text-align:right; + } + </style> + + + </head> + <body> +  + + <h1><a name="top">JDepend Analysis</a></h1> + <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p> + <hr size="2" /> + + <table width="100%"><tr><td> + <a name="NVsummary"><h2>Summary</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <table width="100%" class="details"> + <tr> + <th>Package</th> + <th>Total Classes</th> + <th><a href="#EXnumber">Abstract Classes</a></th> + <th><a href="#EXnumber">Concrete Classes</a></th> + <th><a href="#EXafferent">Afferent Couplings</a></th> + <th><a href="#EXefferent">Efferent Couplings</a></th> + <th><a href="#EXabstractness">Abstractness</a></th> + <th><a href="#EXinstability">Instability</a></th> + <th><a href="#EXdistance">Distance</a></th> + + </tr> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <tr> + <td align="left"> + <a> + <xsl:attribute name="href">#PK<xsl:value-of select="@name"/> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td> + <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td> + <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td> + <td align="right"><xsl:value-of select="Stats/Ca"/></td> + <td align="right"><xsl:value-of select="Stats/Ce"/></td> + <td align="right"><xsl:value-of select="Stats/A"/></td> + <td align="right"><xsl:value-of select="Stats/I"/></td> + <td align="right"><xsl:value-of select="Stats/D"/></td> + + + </tr> + </xsl:if> + </xsl:for-each> + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) > 0"> + <tr> + <td align="left"> + <xsl:value-of select="@name"/> + </td> + <td align="left" colspan="8"><xsl:value-of select="error"/></td> + </tr> + </xsl:if> + </xsl:for-each> + </table> + + <table width="100%"><tr><td> + <a name="NVpackages"><h2>Packages</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <xsl:for-each select="./Packages/Package"> + <xsl:if test="count(error) = 0"> + <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute> + <xsl:value-of select="@name"/></a></h3> + + <table width="100%"><tr> + <td><a href="#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td> + <td><a href="#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td> + <td><a href="#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td> + <td><a href="#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td> + <td><a href="#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td> + </tr></table> + + <table width="100%" class="details"> + <tr> + <th>Abstract Classes</th> + <th>Concrete Classes</th> + <th>Used by Packages</th> + <th>Uses Packages</th> + </tr> + <tr> + <td valign="top" width="25%"> + <xsl:if test="count(AbstractClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="AbstractClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(ConcreteClasses/Class)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="ConcreteClasses/Class"> + <xsl:value-of select="node()"/><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(UsedBy/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="UsedBy/Package"> + <a> + <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + <td valign="top" width="25%"> + <xsl:if test="count(DependsUpon/Package)=0"> + <i>None</i> + </xsl:if> + <xsl:for-each select="DependsUpon/Package"> + <a> + <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute> + <xsl:value-of select="node()"/> + </a><br/> + </xsl:for-each> + </td> + </tr> + </table> + </xsl:if> + </xsl:for-each> + + <table width="100%"><tr><td> + <a name="NVcycles"><h2>Cycles</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <xsl:if test="count(Cycles/Package) = 0"> + <p>There are no cyclic dependancies.</p> + </xsl:if> + <xsl:for-each select="Cycles/Package"> + <h3><xsl:value-of select="@Name"/></h3><p> + <xsl:for-each select="Package"> + <xsl:value-of select="."/><br/> + </xsl:for-each></p> + </xsl:for-each> + + <table width="100%"><tr><td> + <a name="NVexplanations"><h2>Explanations</h2></a> + </td><td align="right"> + [<a href="#NVsummary">summary</a>] + [<a href="#NVpackages">packages</a>] + [<a href="#NVcycles">cycles</a>] + [<a href="#NVexplanations">explanations</a>] + </td></tr></table> + + <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p> + + <h3><a name="EXnumber">Number of Classes</a></h3> + <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p> + <h3><a name="EXafferent">Afferent Couplings</a></h3> + <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p> + <h3><a name="EXefferent">Efferent Couplings</a></h3> + <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p> + <h3><a name="EXabstractness">Abstractness</a></h3> + <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p> + <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p> + <h3><a name="EXinstability">Instability</a></h3> + <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p> + <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p> + <h3><a name="EXdistance">Distance</a></h3> + <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p> + <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p> + <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p> + + </body> + </html> +</xsl:template> + +</xsl:stylesheet> Added: trunk/build/tools/ant/etc/junit-frames-xalan1.xsl =================================================================== --- trunk/build/tools/ant/etc/junit-frames-xalan1.xsl (rev 0) +++ trunk/build/tools/ant/etc/junit-frames-xalan1.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,718 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> + + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:template match="testsuites"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:call-template name="package"> + <xsl:with-param name="name" select="@package"/> + </xsl:call-template> + </xsl:for-each> +</xsl:template> + + +<xsl:template name="package"> + <xsl:param name="name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if> + <xsl:if test="$name = ''">.</xsl:if> + </xsl:variable> +  +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:call-template name="classes.list"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:call-template name="package.summary"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  +  + <xsl:for-each select="/testsuites/testsuite[@package = $name]"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + <xsl:if test="string-length(./system-out)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}-out.txt"> + <xsl:value-of select="./system-out" /> + </redirect:write> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}-err.txt"> + <xsl:value-of select="./system-err" /> + </redirect:write> + </xsl:if> + </xsl:for-each> +</xsl:template> + +<xsl:template name="index.html"> +<html> + <head> + <title>Unit Test Results.</title> + </head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="overview-frame.html" name="packageListFrame"/> + <frame src="allclasses-frame.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> + </frameset> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> +body { + font:normal 68% verdana,arial,helvetica; + color:#000000; +} +table tr td, table tr th { + font-size: 68%; +} +table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; +} +table.details tr td{ + background:#eeeee0; +} + +p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; +} +h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica +} +h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica +} +h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica +} +h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +.Error { + font-weight:bold; color:red; +} +.Failure { + font-weight:bold; color:purple; +} +.Properties { + text-align:right; +} +</xsl:template> + + + +<xsl:template match="testsuite" mode="class.details"> + <xsl:variable name="package.name" select="@package"/> + <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable> + <html> + <head> + <title>Unit Test Results: <xsl:value-of select="$class.name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + <script type="text/javascript" language="JavaScript"> + var TestCases = new Array(); + var cur; + <xsl:apply-templates select="properties"/> + </script> + <script type="text/javascript" language="JavaScript"><![CDATA[ + function displayProperties (name) { + var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); + var doc = win.document; + doc.open(); + doc.write("<html><head><title>Properties of " + name + "</title>"); + doc.write("<style type=\"text/css\">"); + doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); + doc.write("table tr td, table tr th { font-size: 68%; }"); + doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); + doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); + doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); + doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); + doc.write("</style>"); + doc.write("</head><body>"); + doc.write("<h3>Properties of " + name + "</h3>"); + doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); + doc.write("<table class='properties'>"); + doc.write("<tr><th>Name</th><th>Value</th></tr>"); + for (prop in TestCases[name]) { + doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); + } + doc.write("</table>"); + doc.write("</body></html>"); + doc.close(); + win.focus(); + } + ]]> + </script> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <h3>Class <xsl:value-of select="$class.name"/></h3> + + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="." mode="print.test"/> + </table> + + <h2>Tests</h2> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"/> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"><xsl:apply-templates select="./error"/></td> + </tr> + </xsl:if> + <xsl:apply-templates select="./testcase" mode="print.test"/> + </table> + <div class="Properties"> + <a> + <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute> + Properties » + </a> + </div> + <xsl:if test="string-length(./system-out)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute> + System.out » + </a> + </div> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.txt</xsl:attribute> + System.err » + </a> + </div> + </xsl:if> + </body> + </html> +</xsl:template> + +  + <xsl:template match="properties"> + cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); + <xsl:for-each select="property"> + <xsl:sort select="@name"/> + cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; + </xsl:for-each> + </xsl:template> + + + + +<xsl:template name="classes.list"> + <xsl:param name="name"/> + <html> + <head> + <title>Unit Test Classes: <xsl:value-of select="$name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <h2><a href="package-summary.html" target="classFrame"> + <xsl:value-of select="$name"/> + <xsl:if test="$name = ''"><none></xsl:if> + </a></h2> + </td> + </tr> + </table> + + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="/testsuites/testsuite[./@package = $name]"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.classes"> + <html> + <head> + <title>All Unit Test Classes</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite" mode="all.classes"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.classes"> + <xsl:variable name="package.name" select="@package"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.packages"> + <html> + <head> + <title>All Unit Test Packages</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages"> + <xsl:sort select="@package"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="testsuites" mode="overview.packages"> + <html> + <head> + <title>Unit Test Results: Summary</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h2>Summary</h2> + <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> + <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> + <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> + <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> + <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <tr valign="top"> + <th>Tests</th> + <th>Failures</th> + <th>Errors</th> + <th>Success rate</th> + <th>Time</th> + </tr> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$errorCount > 0">Error</xsl:when> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="$testCount"/></td> + <td><xsl:value-of select="$failureCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + <td> + <xsl:call-template name="display-percent"> + <xsl:with-param name="value" select="$successRate"/> + </xsl:call-template> + </td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + </tr> + </table> + <table border="0" width="95%"> + <tr> + <td style="text-align: justify;"> + Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated. + </td> + </tr> + </table> + + <h2>Packages</h2> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package" order="ascending"/> +  + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when> + <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a href="./{translate(@package,'.','/')}/package-summary.html"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a></td> + <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> + <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> + <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="sum($insamepackage/@time)"/> + </xsl:call-template> + </td> + <td><xsl:value-of select="$insamepackage/@timestamp"/></td> + <td><xsl:value-of select="$insamepackage/@hostname"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template name="package.summary"> + <xsl:param name="name"/> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="$name"/></h3> + +  + + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/> + <xsl:if test="count($insamepackage) > 0"> + <h2>Classes</h2> + <p> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="$insamepackage" mode="print.test"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </p> + </xsl:if> + </body> + </html> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link> +</xsl:template> + + + +<xsl:template name="pageHeader"> + <h1>Unit Test Results</h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="testsuite.test.header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + <th nowrap="nowrap">Time Stamp</th> + <th>Host</th> + </tr> +</xsl:template> + + +<xsl:template name="testcase.test.header"> + <tr valign="top"> + <th>Name</th> + <th>Status</th> + <th width="80%">Type</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + + +<xsl:template match="testsuite" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="@errors[.> 0]">Error</xsl:when> + <xsl:when test="@failures[.> 0]">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a href="{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:apply-templates select="@tests"/></td> + <td><xsl:apply-templates select="@errors"/></td> + <td><xsl:apply-templates select="@failures"/></td> + <td><xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + <td><xsl:apply-templates select="@timestamp"/></td> + <td><xsl:apply-templates select="@hostname"/></td> + </tr> +</xsl:template> + +<xsl:template match="testcase" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="error">Error</xsl:when> + <xsl:when test="failure">Failure</xsl:when> + <xsl:otherwise>TableRowColor</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="@name"/></td> + <xsl:choose> + <xsl:when test="failure"> + <td>Failure</td> + <td><xsl:apply-templates select="failure"/></td> + </xsl:when> + <xsl:when test="error"> + <td>Error</td> + <td><xsl:apply-templates select="error"/></td> + </xsl:when> + <xsl:otherwise> + <td>Success</td> + <td></td> + </xsl:otherwise> + </xsl:choose> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="failure"> + <xsl:call-template name="display-failures"/> +</xsl:template> + +<xsl:template match="error"> + <xsl:call-template name="display-failures"/> +</xsl:template> + + +<xsl:template name="display-failures"> + <xsl:choose> + <xsl:when test="not(@message)">N/A</xsl:when> + <xsl:otherwise> + <xsl:value-of select="@message"/> + </xsl:otherwise> + </xsl:choose> +  + <br/><br/> + <code> + <xsl:call-template name="br-replace"> + <xsl:with-param name="word" select="."/> + </xsl:call-template> + </code> +  +  +</xsl:template> + +<xsl:template name="JS-escape"> + <xsl:param name="string"/> + <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/> + <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/> + <xsl:value-of select="$tmp2"/> +</xsl:template> + + + +<xsl:template name="br-replace"> + <xsl:param name="word"/> + <xsl:param name="br"><br/></xsl:param> + <xsl:value-of select='stringutils:replace(string($word),"
",$br)'/> +</xsl:template> + +<xsl:template name="display-time"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.000')"/> +</xsl:template> + +<xsl:template name="display-percent"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.00%')"/> +</xsl:template> +</xsl:stylesheet> Added: trunk/build/tools/ant/etc/junit-frames.xsl =================================================================== --- trunk/build/tools/ant/etc/junit-frames.xsl (rev 0) +++ trunk/build/tools/ant/etc/junit-frames.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,875 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="http://xml.apache.org/xalan/redirect" + xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> + + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:template match="testsuites"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/all-tests.html"> + <xsl:apply-templates select="." mode="all.tests"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/alltests-fails.html"> + <xsl:apply-templates select="." mode="all.tests"> + <xsl:with-param name="type" select="'fails'"/> + </xsl:apply-templates> + </redirect:write> + +  + <redirect:write file="{$output.dir}/alltests-errors.html"> + <xsl:apply-templates select="." mode="all.tests"> + <xsl:with-param name="type" select="'errors'"/> + </xsl:apply-templates> + </redirect:write> + +  + <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:call-template name="package"> + <xsl:with-param name="name" select="@package"/> + </xsl:call-template> + </xsl:for-each> +</xsl:template> + + +<xsl:template name="package"> + <xsl:param name="name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if> + <xsl:if test="$name = ''">.</xsl:if> + </xsl:variable> +  +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:call-template name="classes.list"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:call-template name="package.summary"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  +  + <xsl:for-each select="/testsuites/testsuite[@package = $name]"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + <xsl:if test="string-length(./system-out)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-out.txt"> + <xsl:value-of disable-output-escaping="yes" select="./system-out"/> + </redirect:write> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-err.txt"> + <xsl:value-of disable-output-escaping="yes" select="./system-err"/> + </redirect:write> + </xsl:if> + <xsl:if test="@failures != 0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-fails.html"> + <xsl:apply-templates select="." mode="class.details"> + <xsl:with-param name="type" select="'fails'"/> + </xsl:apply-templates> + </redirect:write> + </xsl:if> + <xsl:if test="@errors != 0"> + <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{(a)name}-errors.html"> + <xsl:apply-templates select="." mode="class.details"> + <xsl:with-param name="type" select="'errors'"/> + </xsl:apply-templates> + </redirect:write> + </xsl:if> + </xsl:for-each> +</xsl:template> + +<xsl:template name="index.html"> +<html> + <head> + <title>Unit Test Results.</title> + </head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="overview-frame.html" name="packageListFrame"/> + <frame src="allclasses-frame.html" name="classListFrame"/> + </frameset> + <frame src="overview-summary.html" name="classFrame"/> + <noframes> + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </p> + </noframes> + </frameset> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> +body { + font:normal 68% verdana,arial,helvetica; + color:#000000; +} +table tr td, table tr th { + font-size: 68%; +} +table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; +} +table.details tr td{ + background:#eeeee0; +} + +p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; +} +h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica +} +h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica +} +h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica +} +h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica +} +.Error { + font-weight:bold; color:red; +} +.Failure { + font-weight:bold; color:purple; +} +.Properties { + text-align:right; +} +</xsl:template> + + +<xsl:template match="testsuites" mode="all.tests"> + <xsl:param name="type" select="'all'"/> + <html> + <xsl:variable name="title"> + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <xsl:text>All Failures</xsl:text> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <xsl:text>All Errors</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>All Tests</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <head> + <title>Unit Test Results: <xsl:value-of select="$title"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h2><xsl:value-of select="$title"/></h2> + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:call-template> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"> + <xsl:apply-templates select="./error"/> + </td> + </tr> + </xsl:if> + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <xsl:apply-templates select=".//testcase[failure]" mode="print.test"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <xsl:apply-templates select=".//testcase[error]" mode="print.test"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select=".//testcase" mode="print.test"> + <xsl:with-param name="show.class" select="'yes'"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> + </table> + </body> + </html> +</xsl:template> + + + +<xsl:template match="testsuite" mode="class.details"> + <xsl:param name="type" select="'all'"/> + <xsl:variable name="package.name" select="@package"/> + <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable> + <html> + <head> + <title>Unit Test Results: <xsl:value-of select="$class.name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + <script type="text/javascript" language="JavaScript"> + var TestCases = new Array(); + var cur; + <xsl:apply-templates select="properties"/> + </script> + <script type="text/javascript" language="JavaScript"><![CDATA[ + function displayProperties (name) { + var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); + var doc = win.document; + doc.open(); + doc.write("<html><head><title>Properties of " + name + "</title>"); + doc.write("<style type=\"text/css\">"); + doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); + doc.write("table tr td, table tr th { font-size: 68%; }"); + doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); + doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); + doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); + doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); + doc.write("</style>"); + doc.write("</head><body>"); + doc.write("<h3>Properties of " + name + "</h3>"); + doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); + doc.write("<table class='properties'>"); + doc.write("<tr><th>Name</th><th>Value</th></tr>"); + for (prop in TestCases[name]) { + doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); + } + doc.write("</table>"); + doc.write("</body></html>"); + doc.close(); + win.focus(); + } + ]]> + </script> + </head> + <body> + <xsl:call-template name="pageHeader"/> + <h3>Class <xsl:value-of select="$class.name"/></h3> + + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="." mode="print.test"/> + </table> + + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <h2>Failures</h2> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <h2>Errors</h2> + </xsl:when> + <xsl:otherwise> + <h2>Tests</h2> + </xsl:otherwise> + </xsl:choose> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"/> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"><xsl:apply-templates select="./error"/></td> + </tr> + </xsl:if> + <xsl:choose> + <xsl:when test="$type = 'fails'"> + <xsl:apply-templates select="./testcase[failure]" mode="print.test"/> + </xsl:when> + <xsl:when test="$type = 'errors'"> + <xsl:apply-templates select="./testcase[error]" mode="print.test"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="./testcase" mode="print.test"/> + </xsl:otherwise> + </xsl:choose> + </table> + <div class="Properties"> + <a> + <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute> + Properties » + </a> + </div> + <xsl:if test="string-length(./system-out)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute> + System.out » + </a> + </div> + </xsl:if> + <xsl:if test="string-length(./system-err)!=0"> + <div class="Properties"> + <a> + <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute> + System.err » + </a> + </div> + </xsl:if> + </body> + </html> +</xsl:template> + +  + <xsl:template match="properties"> + cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); + <xsl:for-each select="property"> + <xsl:sort select="@name"/> + cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; + </xsl:for-each> + </xsl:template> + + + + +<xsl:template name="classes.list"> + <xsl:param name="name"/> + <html> + <head> + <title>Unit Test Classes: <xsl:value-of select="$name"/></title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <h2><a href="package-summary.html" target="classFrame"> + <xsl:value-of select="$name"/> + <xsl:if test="$name = ''"><none></xsl:if> + </a></h2> + </td> + </tr> + </table> + + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="/testsuites/testsuite[./@package = $name]"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{@id}_{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.classes"> + <html> + <head> + <title>All Unit Test Classes</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite" mode="all.classes"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.classes"> + <xsl:variable name="package.name" select="@package"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@id"/>_<xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="testsuites" mode="all.packages"> + <html> + <head> + <title>All Unit Test Packages</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages"> + <xsl:sort select="@package"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="testsuite" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="testsuites" mode="overview.packages"> + <html> + <head> + <title>Unit Test Results: Summary</title> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h2>Summary</h2> + <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> + <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> + <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> + <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> + <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <tr valign="top"> + <th>Tests</th> + <th>Failures</th> + <th>Errors</th> + <th>Success rate</th> + <th>Time</th> + </tr> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$errorCount > 0">Error</xsl:when> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td> + <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td> + <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td> + <td> + <xsl:call-template name="display-percent"> + <xsl:with-param name="value" select="$successRate"/> + </xsl:call-template> + </td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + </tr> + </table> + <table border="0" width="95%"> + <tr> + <td style="text-align: justify;"> + Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated. + </td> + </tr> + </table> + + <h2>Packages</h2> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package" order="ascending"/> +  + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="sum($insamepackage/@errors) > 0">Error</xsl:when> + <xsl:when test="sum($insamepackage/@failures) > 0">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a href="./{translate(@package,'.','/')}/package-summary.html"> + <xsl:value-of select="@package"/> + <xsl:if test="@package = ''"><none></xsl:if> + </a></td> + <td><xsl:value-of select="sum($insamepackage/@tests)"/></td> + <td><xsl:value-of select="sum($insamepackage/@errors)"/></td> + <td><xsl:value-of select="sum($insamepackage/@failures)"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="sum($insamepackage/@time)"/> + </xsl:call-template> + </td> + <td><xsl:value-of select="$insamepackage/@timestamp"/></td> + <td><xsl:value-of select="$insamepackage/@hostname"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + + +<xsl:template name="package.summary"> + <xsl:param name="name"/> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </head> + <body> + <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="$name"/></h3> + +  + + <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/> + <xsl:if test="count($insamepackage) > 0"> + <h2>Classes</h2> + <p> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + <xsl:apply-templates select="$insamepackage" mode="print.test"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </p> + </xsl:if> + </body> + </html> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link> +</xsl:template> + + + +<xsl:template name="pageHeader"> + <h1>Unit Test Results</h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="testsuite.test.header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + <th nowrap="nowrap">Time Stamp</th> + <th>Host</th> + </tr> +</xsl:template> + + +<xsl:template name="testcase.test.header"> + <xsl:param name="show.class" select="''"/> + <tr valign="top"> + <xsl:if test="boolean($show.class)"> + <th>Class</th> + </xsl:if> + <th>Name</th> + <th>Status</th> + <th width="80%">Type</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + + +<xsl:template match="testsuite" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="@errors[.> 0]">Error</xsl:when> + <xsl:when test="@failures[.> 0]">Failure</xsl:when> + <xsl:otherwise>Pass</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <td><a title="Display all tests" href="{@id}_{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><a title="Display all tests" href="{@id}_{(a)name}.html"><xsl:apply-templates select="@tests"/></a></td> + <td> + <xsl:choose> + <xsl:when test="@errors != 0"> + <a title="Display only errors" href="{@id}_{(a)name}-errors.html"><xsl:apply-templates select="@errors"/></a> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="@errors"/> + </xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="@failures != 0"> + <a title="Display only failures" href="{@id}_{(a)name}-fails.html"><xsl:apply-templates select="@failures"/></a> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="@failures"/> + </xsl:otherwise> + </xsl:choose> + </td> + <td><xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + <td><xsl:apply-templates select="@timestamp"/></td> + <td><xsl:apply-templates select="@hostname"/></td> + </tr> +</xsl:template> + +<xsl:template match="testcase" mode="print.test"> + <xsl:param name="show.class" select="''"/> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="error">Error</xsl:when> + <xsl:when test="failure">Failure</xsl:when> + <xsl:otherwise>TableRowColor</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:variable name="class.href"> + <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/> + </xsl:variable> + <xsl:if test="boolean($show.class)"> + <td><a href="{$class.href}"><xsl:value-of select="../@name"/></a></td> + </xsl:if> + <td> + <a name="{@name}"/> + <xsl:choose> + <xsl:when test="boolean($show.class)"> + <a href="{concat($class.href, '#', @name)}"><xsl:value-of select="@name"/></a> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@name"/> + </xsl:otherwise> + </xsl:choose> + </td> + <xsl:choose> + <xsl:when test="failure"> + <td>Failure</td> + <td><xsl:apply-templates select="failure"/></td> + </xsl:when> + <xsl:when test="error"> + <td>Error</td> + <td><xsl:apply-templates select="error"/></td> + </xsl:when> + <xsl:otherwise> + <td>Success</td> + <td></td> + </xsl:otherwise> + </xsl:choose> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="failure"> + <xsl:call-template name="display-failures"/> +</xsl:template> + +<xsl:template match="error"> + <xsl:call-template name="display-failures"/> +</xsl:template> + + +<xsl:template name="display-failures"> + <xsl:choose> + <xsl:when test="not(@message)">N/A</xsl:when> + <xsl:otherwise> + <xsl:value-of select="@message"/> + </xsl:otherwise> + </xsl:choose> +  + <br/><br/> + <code> + <xsl:call-template name="br-replace"> + <xsl:with-param name="word" select="."/> + </xsl:call-template> + </code> +  +  +</xsl:template> + +<xsl:template name="JS-escape"> + <xsl:param name="string"/> + <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/> + <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/> + <xsl:value-of select="$tmp2"/> +</xsl:template> + + + +<xsl:template name="br-replace"> + <xsl:param name="word"/> + <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/> +</xsl:template> + +<xsl:template name="display-time"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.000')"/> +</xsl:template> + +<xsl:template name="display-percent"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.00%')"/> +</xsl:template> +</xsl:stylesheet> Added: trunk/build/tools/ant/etc/junit-noframes.xsl =================================================================== --- trunk/build/tools/ant/etc/junit-noframes.xsl (rev 0) +++ trunk/build/tools/ant/etc/junit-noframes.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,464 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"> +<xsl:output method="html" indent="yes" encoding="US-ASCII" + doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" /> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + + +<xsl:template match="testsuites"> + <html> + <head> + <title>Unit Test Results</title> + <style type="text/css"> + body { + font:normal 68% verdana,arial,helvetica; + color:#000000; + } + table tr td, table tr th { + font-size: 68%; + } + table.details tr th{ + font-weight: bold; + text-align:left; + background:#a6caf0; + } + table.details tr td{ + background:#eeeee0; + } + + p { + line-height:1.5em; + margin-top:0.5em; margin-bottom:1.0em; + } + h1 { + margin: 0px 0px 5px; font: 165% verdana,arial,helvetica + } + h2 { + margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica + } + h3 { + margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica + } + h4 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h5 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + h6 { + margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica + } + .Error { + font-weight:bold; color:red; + } + .Failure { + font-weight:bold; color:purple; + } + .Properties { + text-align:right; + } + </style> + <script type="text/javascript" language="JavaScript"> + var TestCases = new Array(); + var cur; + <xsl:for-each select="./testsuite"> + <xsl:apply-templates select="properties"/> + </xsl:for-each> + + </script> + <script type="text/javascript" language="JavaScript"><![CDATA[ + function displayProperties (name) { + var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); + var doc = win.document; + doc.open(); + doc.write("<html><head><title>Properties of " + name + "</title>"); + doc.write("<style>") + doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); + doc.write("table tr td, table tr th { font-size: 68%; }"); + doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); + doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); + doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); + doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); + doc.write("</style>"); + doc.write("</head><body>"); + doc.write("<h3>Properties of " + name + "</h3>"); + doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); + doc.write("<table class='properties'>"); + doc.write("<tr><th>Name</th><th>Value</th></tr>"); + for (prop in TestCases[name]) { + doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); + } + doc.write("</table>"); + doc.write("</body></html>"); + doc.close(); + win.focus(); + } + ]]> + </script> + </head> + <body> + <a name="top"></a> + <xsl:call-template name="pageHeader"/> + +  + <xsl:call-template name="summary"/> + <hr size="1" width="95%" align="left"/> + +  + <xsl:call-template name="packagelist"/> + <hr size="1" width="95%" align="left"/> + +  + <xsl:call-template name="packages"/> + <hr size="1" width="95%" align="left"/> + +  + <xsl:call-template name="classes"/> + + </body> + </html> +</xsl:template> + + + +  +  +  +  + <xsl:template name="packagelist"> + <h2>Packages</h2> + Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> +  + <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package"/> + <xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/> + <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/> + <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/> + <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/> + <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/> + +  + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:when test="$errorCount > 0">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + <td><a href="#{@package}"><xsl:value-of select="@package"/></a></td> + <td><xsl:value-of select="$testCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + <td><xsl:value-of select="$failureCount"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + <td><xsl:value-of select="$testsuites-in-package/@timestamp"/></td> + <td><xsl:value-of select="$testsuites-in-package/@hostname"/></td> + </tr> + </xsl:for-each> + </table> + </xsl:template> + + +  +  +  +  +  + <xsl:template name="packages"> +  + <xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> + <xsl:sort select="@package"/> + <a name="{@package}"></a> + <h3>Package <xsl:value-of select="@package"/></h3> + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testsuite.test.header"/> + +  + <xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/> + </table> + <a href="#top">Back to top</a> + <p/> + <p/> + </xsl:for-each> + </xsl:template> + + <xsl:template name="classes"> + <xsl:for-each select="testsuite"> + <xsl:sort select="@name"/> +  + <a name="{@name}"></a> + <h3>TestCase <xsl:value-of select="@name"/></h3> + + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <xsl:call-template name="testcase.test.header"/> +  + <xsl:if test="./error"> + <tr class="Error"> + <td colspan="4"><xsl:apply-templates select="./error"/></td> + </tr> + </xsl:if> + <xsl:apply-templates select="./testcase" mode="print.test"/> + </table> + <div class="Properties"> + <a> + <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute> + Properties » + </a> + </div> + <p/> + + <a href="#top">Back to top</a> + </xsl:for-each> + </xsl:template> + + <xsl:template name="summary"> + <h2>Summary</h2> + <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> + <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> + <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/> + <xsl:variable name="timeCount" select="sum(testsuite/@time)"/> + <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/> + <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%"> + <tr valign="top"> + <th>Tests</th> + <th>Failures</th> + <th>Errors</th> + <th>Success rate</th> + <th>Time</th> + </tr> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="$failureCount > 0">Failure</xsl:when> + <xsl:when test="$errorCount > 0">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="$testCount"/></td> + <td><xsl:value-of select="$failureCount"/></td> + <td><xsl:value-of select="$errorCount"/></td> + <td> + <xsl:call-template name="display-percent"> + <xsl:with-param name="value" select="$successRate"/> + </xsl:call-template> + </td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="$timeCount"/> + </xsl:call-template> + </td> + + </tr> + </table> + <table border="0" width="95%"> + <tr> + <td style="text-align: justify;"> + Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated. + </td> + </tr> + </table> + </xsl:template> + +  + <xsl:template match="properties"> + cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array(); + <xsl:for-each select="property"> + <xsl:sort select="@name"/> + cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>'; + </xsl:for-each> + </xsl:template> + + +<xsl:template name="pageHeader"> + <h1>Unit Test Results</h1> + <table width="100%"> + <tr> + <td align="left"></td> + <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org/ant'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + +<xsl:template match="testsuite" mode="header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + +<xsl:template name="testsuite.test.header"> + <tr valign="top"> + <th width="80%">Name</th> + <th>Tests</th> + <th>Errors</th> + <th>Failures</th> + <th nowrap="nowrap">Time(s)</th> + <th nowrap="nowrap">Time Stamp</th> + <th>Host</th> + </tr> +</xsl:template> + + +<xsl:template name="testcase.test.header"> + <tr valign="top"> + <th>Name</th> + <th>Status</th> + <th width="80%">Type</th> + <th nowrap="nowrap">Time(s)</th> + </tr> +</xsl:template> + + + +<xsl:template match="testsuite" mode="print.test"> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="@failures[.> 0]">Failure</xsl:when> + <xsl:when test="@errors[.> 0]">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + +  + <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td> + <td><xsl:value-of select="@tests"/></td> + <td><xsl:value-of select="@errors"/></td> + <td><xsl:value-of select="@failures"/></td> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + <td><xsl:apply-templates select="@timestamp"/></td> + <td><xsl:apply-templates select="@hostname"/></td> + </tr> +</xsl:template> + +<xsl:template match="testcase" mode="print.test"> + <tr valign="top"> + <xsl:attribute name="class"> + <xsl:choose> + <xsl:when test="failure | error">Error</xsl:when> + </xsl:choose> + </xsl:attribute> + <td><xsl:value-of select="@name"/></td> + <xsl:choose> + <xsl:when test="failure"> + <td>Failure</td> + <td><xsl:apply-templates select="failure"/></td> + </xsl:when> + <xsl:when test="error"> + <td>Error</td> + <td><xsl:apply-templates select="error"/></td> + </xsl:when> + <xsl:otherwise> + <td>Success</td> + <td></td> + </xsl:otherwise> + </xsl:choose> + <td> + <xsl:call-template name="display-time"> + <xsl:with-param name="value" select="@time"/> + </xsl:call-template> + </td> + </tr> +</xsl:template> + + +<xsl:template match="failure"> + <xsl:call-template name="display-failures"/> +</xsl:template> + +<xsl:template match="error"> + <xsl:call-template name="display-failures"/> +</xsl:template> + + +<xsl:template name="display-failures"> + <xsl:choose> + <xsl:when test="not(@message)">N/A</xsl:when> + <xsl:otherwise> + <xsl:value-of select="@message"/> + </xsl:otherwise> + </xsl:choose> +  + <code> + <br/><br/> + <xsl:call-template name="br-replace"> + <xsl:with-param name="word" select="."/> + </xsl:call-template> + </code> +  +  +</xsl:template> + +<xsl:template name="JS-escape"> + <xsl:param name="string"/> + <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/> + <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),"'","\'")"/> + <xsl:value-of select="$tmp2"/> +</xsl:template> + + + +<xsl:template name="br-replace"> + <xsl:param name="word"/> + <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/> +</xsl:template> + +<xsl:template name="display-time"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.000')"/> +</xsl:template> + +<xsl:template name="display-percent"> + <xsl:param name="value"/> + <xsl:value-of select="format-number($value,'0.00%')"/> +</xsl:template> + +</xsl:stylesheet> Added: trunk/build/tools/ant/etc/log.xsl =================================================================== --- trunk/build/tools/ant/etc/log.xsl (rev 0) +++ trunk/build/tools/ant/etc/log.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,202 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> + + + +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + +<xsl:template match="/"> +<html> + <head> + <style type="text/css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin: 0; + font:normal 100% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + table.status { + font:bold 80% arial,helvetica,sanserif; + background-color:#525D76; + color:#ffffff; + } + table.log tr td, tr th { + font-size: 80%; + } + .error { + color:red; + } + .warn { + color:brown; + } + .info { + color:gray; + } + .debug{ + color:gray; + } + .failed { + font-size:80%; + background-color: red; + color:#FFFFFF; + font-weight: bold + } + .complete { + font-size:80%; + background-color: #525D76; + color:#FFFFFF; + font-weight: bold + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + background: #ccc; + color: black; + } + table, th, td { + border: none + } + h3 { + font:bold 80% arial,helvetica,sanserif; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } + </style> + </head> + <body> +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td valign="top" class="bannercell"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right;vertical-align:bottom"> + <a href="http://ant.apache.org/">Apache Ant</a> + </td> + </tr> + </table> + + <table border="0" width="100%"> + <tr><td><hr noshade="yes" size="1"/></td></tr> + </table> + + <xsl:apply-templates select="build"/> + + </body> +</html> +</xsl:template> + +<xsl:template match="build"> +  + <table width="100%"> + <xsl:attribute name="class"> + <xsl:if test="@error">failed</xsl:if> + <xsl:if test="not(@error)">complete</xsl:if> + </xsl:attribute> + <tr> + <xsl:if test="@error"> + <td nowrap="yes">Build Failed</td> + </xsl:if> + <xsl:if test="not(@error)"> + <td nowrap="yes">Build Complete</td> + </xsl:if> + <td style="text-align:right" nowrap="yes">Total Time: <xsl:value-of select="@time"/></td> + </tr> + <tr> + <td colspan="2"> + <xsl:if test="@error"> + <tt><xsl:value-of select="@error"/></tt><br/> + <i style="font-size:80%">See the <a href="#stacktrace" alt="Click for details">stacktrace</a>.</i> + </xsl:if> + </td> + </tr> + </table> + <table border="1" cellspacing="2" cellpadding="3" width="100%" style="font-size:80%"> + <tr class="a"><td width="1">ant.file</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.file')], '->')"/></td></tr> + <tr class="b"><td width="1">ant.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'ant.version')], '->')"/></td></tr> + <tr class="a"><td width="1">java.version</td><td><xsl:value-of select="substring-after(//message[contains(text(),'java.vm.version')], '->')"/></td></tr> + <tr class="b"><td width="1">os.name</td><td><xsl:value-of select="substring-after(//message[contains(text(),'os.name')], '->')"/></td></tr> + </table> +  + <h3>Build events</h3> + <table class="log" border="1" cellspacing="2" cellpadding="3" width="100%"> + <tr> + <th nowrap="yes" align="left" width="1%">target</th> + <th nowrap="yes" align="left" width="1%">task</th> + <th nowrap="yes" align="left">message</th> + </tr> + <xsl:apply-templates select=".//message[@priority != 'debug']"/> + </table> + <p> +  + <xsl:if test="stacktrace"> + <a name="stacktrace"/> + <h3>Error details</h3> + <table width="100%"> + <tr><td> + <pre><xsl:value-of select="stacktrace"/></pre> + </td></tr> + </table> + </xsl:if> + </p> +</xsl:template> + + +<xsl:template match="message[@priority!='debug']"> + <tr valign="top"> +  + <xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> + </xsl:attribute> + <td nowrap="yes" width="1%"><xsl:value-of select="../../@name"/></td> + <td nowrap="yes" style="text-align:right" width="1%">[ <xsl:value-of select="../@name"/> ]</td> + <td class="{@priority}" nowrap="yes"> + <xsl:value-of select="text()"/> + </td> + </tr> +</xsl:template> + +</xsl:stylesheet> Added: trunk/build/tools/ant/etc/maudit-frames.xsl =================================================================== --- trunk/build/tools/ant/etc/maudit-frames.xsl (rev 0) +++ trunk/build/tools/ant/etc/maudit-frames.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,502 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:redirect="org.apache.xalan.lib.Redirect" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:template match="classes"> +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:for-each select="./class[not(./@package = preceding-sibling::class/@package)]"> + <xsl:call-template name="package"> + <xsl:with-param name="name" select="@package"/> + </xsl:call-template> + </xsl:for-each> +</xsl:template> + + +<xsl:template name="package"> + <xsl:param name="name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if> + <xsl:if test="$name = ''">.</xsl:if> + </xsl:variable> +  +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:call-template name="classes.list"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:call-template name="package.summary"> + <xsl:with-param name="name" select="$name"/> + </xsl:call-template> + </redirect:write> + +  +  + <xsl:for-each select="/classes/class[@package = $name]"> + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + </xsl:for-each> +</xsl:template> + +<xsl:template name="index.html"> +<HTML> + <HEAD><TITLE>Audit Results.</TITLE></HEAD> + <FRAMESET cols="20%,80%"> + <FRAMESET rows="30%,70%"> + <FRAME src="overview-frame.html" name="packageListFrame"/> + <FRAME src="allclasses-frame.html" name="classListFrame"/> + </FRAMESET> + <FRAME src="overview-summary.html" name="classFrame"/> + </FRAMESET> + <noframes> + <H2>Frame Alert</H2> + <P> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </P> + </noframes> +</HTML> +</xsl:template> + + + +<xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } +</xsl:template> + + + +<xsl:template match="class" mode="class.details"> + <xsl:variable name="package.name" select="@package"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:call-template name="pageHeader"/> + <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3> + + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="class.audit.header"/> + <xsl:apply-templates select="." mode="print.audit"/> + </table> + + <H3>Violations</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="violation.audit.header"/> + <xsl:apply-templates select="./violation" mode="print.audit"> + <xsl:sort data-type="number" select="@line"/> + </xsl:apply-templates> + </table> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template name="classes.list"> + <xsl:param name="name"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </HEAD> + <BODY> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="$name"/></a></H2> + </td> + </tr> + </table> + + <h2>Classes</h2> + <TABLE WIDTH="100%"> + <xsl:apply-templates select="/classes/class[./@package = $name]" mode="classes.list"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </TABLE> + </BODY> + </HTML> +</xsl:template> + +<xsl:template match="class" mode="classes.list"> + <tr> + <td nowrap="nowrap"> +  + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="classes" mode="all.classes"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:apply-templates select=".//class" mode="all.classes"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="class" mode="all.classes"> +  + <xsl:variable name="package.name" select="@package"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + + +<xsl:template match="classes" mode="all.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select="class[not(./@package = preceding-sibling::class/@package)]" mode="all.packages"> + <xsl:sort select="@package" order="ascending"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="class" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="{translate(@package,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@package"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="classes" mode="overview.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name"/> + </xsl:call-template> + </head> + <body onload="open('allclasses-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Summary</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th>Audited classes</th> + <th>Reported classes</th> + <th>Violations</th> + </tr> + <tr class="a"> + <td><xsl:value-of select="@audited"/></td> + <td><xsl:value-of select="@reported"/></td> + <td><xsl:value-of select="@violations"/></td> + </tr> + </table> + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + Note: Rules checked have originated from style guidelines suggested by the language designers, + experience from the Java development community and insite experience. Violations are generally + reported with a reference to the <a href="http://java.sun.com/docs/books/jls/second_edition/html/jTOC.doc.html">Java Language Specifications</a> (JLS x.x.x) + and Metamata Audit rules (x.x). + Please consult these documents for additional information about violations. + <p/> + Rules checked also enforce adherence to <a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun Java coding guidelines</a> in use at Jakarta. + <p/> + One should note that these violations do not necessary underline errors but should be used + as an indication for <i>possible</i> errors. As always, use your best judgment and review + them carefully, it might save you hours of debugging. + </td> + </tr> + </table> + + <h3>Packages</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="class.audit.header"/> + <xsl:for-each select="class[not(./@package = preceding-sibling::class/@package)]"> + <xsl:sort select="@package" order="ascending"/> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of select="@package"/></a></td> + <td><xsl:value-of select="sum(/classes/class[./@package = current()/@package]/@violations)"/></td> + </tr> + </xsl:for-each> + </table> + <xsl:call-template name="pageFooter"/> + </body> + </html> +</xsl:template> + + +<xsl:template name="package.summary"> + <xsl:param name="name"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute> + <xsl:call-template name="pageHeader"/> + <h3>Package <xsl:value-of select="$name"/></h3> + +  + + <xsl:if test="count(/classes/class[./@package = $name]) > 0"> + <H3>Classes</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="class.audit.header"/> + <xsl:apply-templates select="/classes/class[./@package = $name]" mode="print.audit"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </xsl:if> + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK> +</xsl:template> + + +<xsl:template name="pageHeader"> + +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="bannercell" rowspan="2"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right"><h2>Source Code Audit</h2></td> + </tr> + <tr> + <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Audit</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="pageFooter"> +</xsl:template> + + + +<xsl:template name="class.audit.header"> + <tr> + <th width="80%">Name</th> + <th>Violations</th> + </tr> +</xsl:template> + + +<xsl:template name="violation.audit.header"> + <tr> + <th>Line</th> + <th>Message</th> + </tr> +</xsl:template> + + + +<xsl:template match="class" mode="print.audit"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:apply-templates select="@violations"/></td> + </tr> +</xsl:template> + +<xsl:template match="violation" mode="print.audit"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:value-of select="@line"/></td> + <td><xsl:apply-templates select="@message"/></td> + </tr> +</xsl:template> + + +<xsl:template name="alternate-row"> +<xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> +</xsl:attribute> +</xsl:template> + +</xsl:stylesheet> + Added: trunk/build/tools/ant/etc/mmetrics-frames.xsl =================================================================== --- trunk/build/tools/ant/etc/mmetrics-frames.xsl (rev 0) +++ trunk/build/tools/ant/etc/mmetrics-frames.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,1025 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:xalan="http://xml.apache.org/xalan" + xmlns:redirect="org.apache.xalan.lib.Redirect" + exclude-result-prefixes="xalan" + extension-element-prefixes="redirect"> +<xsl:output method="html" indent="yes" encoding="US-ASCII"/> +<xsl:decimal-format decimal-separator="." grouping-separator="," /> + + +<xsl:param name="output.dir" select="'.'"/> + + +<xsl:param name="vg.max" select="10"/> +<xsl:param name="loc.max" select="1000"/> +<xsl:param name="dit.max" select="10"/> +<xsl:param name="noa.max" select="250"/> +<xsl:param name="nrm.max" select="50"/> +<xsl:param name="nlm.max" select="250"/> +<xsl:param name="wmc.max" select="250"/> +<xsl:param name="rfc.max" select="50"/> +<xsl:param name="dac.max" select="10"/> +<xsl:param name="fanout.max" select="10"/> +<xsl:param name="cbo.max" select="15"/> +<xsl:param name="lcom.max" select="10"/> +<xsl:param name="nocl.max" select="10"/> + + + +<xsl:variable name="doctree.var"> + <xsl:element name="classes"> + <xsl:for-each select=".//class"> + <xsl:element name="class"> + <xsl:attribute name="package"> + <xsl:value-of select="(ancestor::package)[last()]/@name"/> + </xsl:attribute> + <xsl:copy-of select="@*"/> + <xsl:attribute name="name"> + <xsl:apply-templates select="." mode="class.name"/> + </xsl:attribute> + <xsl:copy-of select="method"/> + </xsl:element> + </xsl:for-each> + </xsl:element> +</xsl:variable> + +<xsl:variable name="doctree" select="xalan:nodeset($doctree.var)"/> + +<xsl:template match="metrics"> + +  + <redirect:write file="{$output.dir}/index.html"> + <xsl:call-template name="index.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/stylesheet.css"> + <xsl:call-template name="stylesheet.css"/> + </redirect:write> + + <redirect:write file="{$output.dir}/metrics-reference.html"> + <xsl:call-template name="metrics-reference.html"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-summary.html"> + <xsl:apply-templates select="." mode="overview.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/overview-frame.html"> + <xsl:apply-templates select="." mode="all.packages"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/allclasses-frame.html"> + <xsl:apply-templates select="." mode="all.classes"/> + </redirect:write> + +  + <xsl:apply-templates select=".//package"/> +</xsl:template> + + +<xsl:template match="package"> + <xsl:variable name="package.name" select="@name"/> + <xsl:variable name="package.dir"> + <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="translate($package.name,'.','/')"/></xsl:if> + <xsl:if test="$package.name = 'unnamed package'">.</xsl:if> + </xsl:variable> +  + <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html"> + <xsl:apply-templates select="." mode="classes.list"/> + </redirect:write> + +  + <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html"> + <xsl:apply-templates select="." mode="package.summary"/> + </redirect:write> + +  +  + <xsl:for-each select="$doctree/classes/class[@package = current()/@name]"> +  + <redirect:write file="{$output.dir}/{$package.dir}/{(a)name}.html"> + <xsl:apply-templates select="." mode="class.details"/> + </redirect:write> + </xsl:for-each> +</xsl:template> + + + +<xsl:template match="class" mode="class.name"> + <xsl:if test="parent::class"><xsl:apply-templates select="parent::class" mode="class.name"/>.<xsl:value-of select="@name"/></xsl:if><xsl:if test="not(parent::class)"><xsl:value-of select="@name"/></xsl:if> +</xsl:template> + + +<xsl:template name="index.html"> +<HTML> + <HEAD><TITLE>Metrics Results.</TITLE></HEAD> + <FRAMESET cols="20%,80%"> + <FRAMESET rows="30%,70%"> + <FRAME src="overview-frame.html" name="packageListFrame"/> + <FRAME src="allclasses-frame.html" name="classListFrame"/> + </FRAMESET> + <FRAME src="overview-summary.html" name="classFrame"/> + </FRAMESET> + <noframes> + <H2>Frame Alert</H2> + <P> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + </P> + </noframes> +</HTML> +</xsl:template> + + +<xsl:template name="metrics-reference.html"> +<html> +<head> +<link title="Style" type="text/css" rel="stylesheet" href="stylesheet.css"/> +</head> +<body style="text-align:justify;"> +<h2>Metrics Reference</h2> +<a href="#V(G)">V(G)</a> | +<a href="#LOC">LOC</a> | +<a href="#DIT">DIT</a> | +<a href="#NOA">NOA</a> | +<a href="#NRM">NRM</a> | +<a href="#NLM">NLM</a> | +<a href="#WMC">WMC</a> | +<a href="#RFC">RFC</a> | +<a href="#DAC">DAC</a> | +<a href="#FANOUT">FANOUT</a> | +<a href="#CBO">CBO</a> | +<a href="#LCOM">LCOM</a> | +<a href="#NOC">NOC</a> + +<a name="V(G)"/> +<h3>Cyclomatic Complexity - V(G)</h3> +This metric was introduced in the 1970s to measure the amount of control +flow complexity or branching complexity in a module such as a +subroutine. It gives the number of paths that may be taken through the +code, and was initially developed to give some measure of the cost of +producing a test case for the module by executing each path. +<p/> +Methods with a high cyclomatic complexity tend to be more difficult to +understand and maintain. In general the more complex the methods of an +application, the more difficult it will be to test it, and this will adversely +affect its reliability. +<p/> +V(G) is a measure of the control flow complexity of a method or +constructor. It counts the number of branches in the body of the method, +defined as: +<ul> +<li>while statements;</li> +<li>if statements;</li> +<li>for statements.</li> +</ul> + +The metric can also be configured to count each case of a switch +statement as well. + +<a name="LOC"/> +<h3>Lines of Code - LOC</h3> + +This is perhaps the simplest of all the metrics to define and compute. +Counting lines has a long history as a software metric dating from before +the rise of structured programming, and it is still in widespread use today. +The size of a method affects the ease with which it can be understood, its +reusability and its maintainability. There are a variety of ways that the size +can be calculated. These include counting all the lines of code, the number +of statements, the blank lines of code, the lines of commentary, and the +lines consisting only of syntax such as block delimiters. +<p/> +This metric can also be used for sizing other constructs as well, for +example, the overall size of a Java class or package can be measured by +counting the number of source lines it consists of. +<p/> +LOC can be used to determine the size of a compilation unit (source file), +class or interface, method, constructor, or field. It can be configured to +ignore: +<ul> +<li>blank lines;</li> +<li>lines consisting only of comments;</li> +<li>lines consisting only of opening and closing braces.</li> +</ul> + +<a name="DIT"/> +<h3>Depth of Inheritance Hierarchy - DIT</h3> + +This metric calculates how far down the inheritance hierarchy a class is +declared. In Java all classes have java.lang.Object as their ultimate +superclass, which is defined to have a depth of 1. So a class that +immediately extends java.lang.Object has a metric value of 2; any of its +subclasses will have a value of 3, and so on. +<p/> +A class that is deep within the tree inherits more methods and state +variables, thereby increasing its complexity and making it difficult to +predict its behavior. It can be harder to understand a system with many +inheritance layers. +<p/> +DIT is defined for classes and interfaces: +<ul> +<li>all interface types have a depth of 1;</li> +<li>the class java.lang.Object has a depth of 1;</li> +<li>all other classes have a depth of 1 + the depth of their super class.</li> +</ul> + +<a name="NOA"/> +<h3>Number of Attributes - NOA</h3> + +The number of distinct state variables in a class serves as one measure of +its complexity. The more state a class represents the more difficult it is to +maintain invariants for it. It also hinders comprehensibility and reuse. +<p/> +In Java, state can be exposed to subclasses through protected fields, which +entails that the subclass also be aware of and maintain any invariants. This +interference with the class's data encapsulation can be a source of defects +and hidden dependencies between the state variables. +<p/> +NOA is defined for classes and interfaces. It counts the number of fields +declared in the class or interface. + +<a name="NRM"/> +<h3>Number of Remote Methods - NRM</h3> + +NRM is defined for classes. A remote method call is defined as an +invocation of a method that is not declared in any of: +<ul> +<li>the class itself;</li> +<li>a class or interface that the class extends or implements;</li> +<li>a class or method that extends the class.</li> +</ul> + +The value is the count of all the remote method calls in all of the methods +and constructors of the class. + +<a name="NLM"/> +<h3>Number of Local Methods - NLM</h3> + +NLM is defined for classes and interfaces. A local method is defined as a +method that is declared in the class or interface. NLM can be configured to +include the local methods of all of the class's superclasses. Methods with +public, protected, package and private visibility can be independently +counted by setting configuration parameters. + +<a name="WMC"/> +<h3>Weighted Methods per Class - WMC</h3> + +If the number of methods in a class can be determined during the design +and modeling phase of a project, it can be used as a predictor of how +much time and effort is needed to develop, debug and maintain it. This +metric can be further refined by incorporating a weighting for the +complexity of each method. The usual weighting is given by the cyclomatic +complexity of the method. +<p/> +The subclasses of a class inherit all of its public and protected methods, +and possibly its package methods as well, so the number of methods a +class has directly impacts the complexity of its subclasses. Classes with +large numbers of methods are often specific to a particular application, +reducing the ability to reuse them. +<p/> +The definition of WMC is based upon NLM, and it provides the same +configuration parameters for counting inherited methods and of varying +visibility. The main difference is that NLM always counts each method as 1, +whereas WMC will weight each method. There are two weighting schemes: +<ul> +<li>V(G) the cyclomatic complexity of the method is used as its weight. + Methods from class files are given a V(G) of 1.</li> +<li>the arity, or the number of parameters of the method are used to + determine the weight.</li> +</ul> + +<a name="RFC"/> +<h3>Response For Class - RFC</h3> + +The response set of a class is the set of all methods that can be invoked as +a result of a message sent to an object of the class. This includes methods +in the class's inheritance hierarchy and methods that can be invoked on +other objects. The Response For Class metric is defined to be size of the +response set for the class. A class which provides a larger response set is +considered to be more complex than one with a smaller response set. +<p/> +One reason for this is that if a method call on a class can result in a large +number of different method calls on the target and other classes, then it +can be harder to test the behavior of the class and debug problems. It will +typically require a deeper understanding of the potential interactions that +objects of the class can have with the rest of the system. +<p/> +RFC is defined as the sum of NLM and NRM for the class. The local methods +include all of the public, protected, package and private methods, but not +methods declared only in a superclass. + +<a name="DAC"/> +<h3>Data Abstraction Coupling - DAC</h3> + +DAC is defined for classes and interfaces. It counts the number of reference +types that are used in the field declarations of the class or interface. The +component types of arrays are also counted. Any field with a type that is +either a supertype or a subtype of the class is not counted. + +<a name="FANOUT"/> +<h3>Fan Out - FANOUT</h3> + +FANOUT is defined for classes and interfaces, constructors and methods. It +counts the number of reference types that are used in: +<ul> +<li>field declarations;</li> +<li>formal parameters and return types;</li> +<li>throws declarations;</li> +<li>local variables.</li> +</ul> + +The component types of arrays are also counted. Any type that is either a +supertype or a subtype of the class is not counted. + +<a name="CBO"/> +<h3>Coupling Between Objects - CBO</h3> + +When one object or class uses another object or class they are said to be +coupled. One major source of coupling is that between a superclass and a +subclass. A coupling is also introduced when a method or field in another +class is accessed, or when an object of another class is passed into or out +of a method invocation. Coupling Between Objects is a measure of the +non-inheritance coupling between two objects. +<p/> +A high value of coupling reduces the modularity of the class and makes +reuse more difficult. The more independent a class is the more likely it is +that it will be possible to reuse it in another part of the system. When a +class is coupled to another class it becomes sensitive to changes in that +class, thereby making maintenance for difficult. In addition, a class that is +overly dependent on other classes can be difficult to understand and test in +isolation. +<p/> +CBO is defined for classes and interfaces, constructors and methods. It +counts the number of reference types that are used in: +<ul> +<li>field declarations</li> +<li>formal parameters and return types</li> +<li>throws declarations</li> +<li>local variables</li> +</ul> + +It also counts: +<ul> +<li>types from which field and method selections are made</li> +</ul> + +The component types of arrays are also counted. Any type that is either a +supertype or a subtype of the class is not counted. + +<a name="LCOM"/> +<h3>Lack of Cohesion Of Methods - LCOM</h3> + +The cohesion of a class is the degree to which its methods are related to +each other. It is determined by examining the pattern of state variable +accesses within the set of methods. If all the methods access the same state +variables then they have high cohesion; if they access disjoint sets of +variables then the cohesion is low. An extreme example of low cohesion +would be if none of the methods accessed any of the state variables. + +If a class exhibits low method cohesion it indicates that the design of the +class has probably been partitioned incorrectly, and could benefit by being +split into more classes with individually higher cohesion. On the other +hand, a high value of cohesion (a low lack of cohesion) implies that the +class is well designed. A cohesive class will tend to provide a high degree +of encapsulation, whereas a lack of cohesion decreases encapsulation and +increases complexity. +<p/> +Another form of cohesion that is useful for Java programs is cohesion +between nested and enclosing classes. A nested class that has very low +cohesion with its enclosing class would probably better designed as a peer +class rather than a nested class. +<p/> +LCOM is defined for classes. Operationally, LCOM takes each pair of +methods in the class and determines the set of fields they each access. If +they have disjoint sets of field accesses increase the count P by one. If they +share at least one field access then increase Q by one. After considering +each pair of methods, +LCOM = (P > Q) ? (P - Q) : 0 +<p/> +Indirect access to fields via local methods can be considered by setting a +metric configuration parameter. + +<a name="NOC"/> +<h3>Number Of Classes - NOC</h3> + +The overall size of the system can be estimated by calculating the number +of classes it contains. A large system with more classes is more complex +than a smaller one because the number of potential interactions between +objects is higher. This reduces the comprehensibility of the system which +in turn makes it harder to test, debug and maintain. +<p/> +If the number of classes in the system can be projected during the initial +design phase of the project it can serve as a base for estimating the total +effort and cost of developing, debugging and maintaining the system. +<p/> +The NOC metric can also usefully be applied at the package and class level +as well as the total system. +<p/> +NOCL is defined for class and interfaces. It counts the number of classes or +interfaces that are declared. This is usually 1, but nested class declarations +will increase this number. +</body> +</html> +</xsl:template> + + +<xsl:template name="stylesheet.css"> + .bannercell { + border: 0px; + padding: 0px; + } + body { + margin-left: 10; + margin-right: 10; + font:normal 80% arial,helvetica,sanserif; + background-color:#FFFFFF; + color:#000000; + } + .a td { + background: #efefef; + } + .b td { + background: #fff; + } + th, td { + text-align: left; + vertical-align: top; + } + th { + font-weight:bold; + background: #ccc; + color: black; + } + table, th, td { + font-size:100%; + border: none + } + table.log tr td, tr th { + + } + h2 { + font-weight:bold; + font-size:140%; + margin-bottom: 5; + } + h3 { + font-size:100%; + font-weight:bold; + background: #525D76; + color: white; + text-decoration: none; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + margin-bottom: 0; + } + .Error { + font-weight:bold; color:red; + } + +</xsl:template> + + +<xsl:template match="class" mode="class.details"> +  + <xsl:variable name="package.name" select="@package"/> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="$package.name"/> + </xsl:call-template> + </HEAD> + <BODY> + <xsl:call-template name="pageHeader"/> + + <H3>Class <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </table> + + <H3>Methods</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="method.metrics.header"/> + <xsl:apply-templates select="method" mode="print.metrics"/> + </table> + + <xsl:call-template name="pageFooter"/> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template match="package" mode="classes.list"> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> + <BODY> + <table width="100%"> + <tr> + <td nowrap="nowrap"> + <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2> + </td> + </tr> + </table> + + <H2>Classes</H2> + <TABLE WIDTH="100%"> +  + <xsl:for-each select="$doctree/classes/class[@package = current()/@name]"> + <xsl:sort select="@name"/> + <tr> + <td nowrap="nowrap"> + <a href="{(a)name}.html" target="classFrame"><xsl:value-of select="@name"/></a> + </td> + </tr> + </xsl:for-each> + </TABLE> + </BODY> + </HTML> +</xsl:template> + + + +<xsl:template match="metrics" mode="all.classes"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="''"/> + </xsl:call-template> + </head> + <body> + <h2>Classes</h2> + <table width="100%"> + <xsl:for-each select="$doctree/classes/class"> + <xsl:sort select="@name"/> + <xsl:apply-templates select="." mode="all.classes"/> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="class" mode="all.classes"> + <xsl:variable name="package.name" select="@package"/> + <xsl:variable name="class.name" select="@name"/> + <tr> + <td nowrap="nowrap"> + <a target="classFrame"> + <xsl:attribute name="href"> + <xsl:if test="not($package.name='unnamed package')"> + <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text> + </xsl:if> + <xsl:value-of select="$class.name"/><xsl:text>.html</xsl:text> + </xsl:attribute> + <xsl:value-of select="$class.name"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="metrics" mode="all.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="./package/@name"/> + </xsl:call-template> + </head> + <body> + <h2><a href="overview-summary.html" target="classFrame">Home</a></h2> + <h2>Packages</h2> + <table width="100%"> + <xsl:apply-templates select=".//package[not(./@name = 'unnamed package')]" mode="all.packages"> + <xsl:sort select="@name"/> + </xsl:apply-templates> + </table> + </body> + </html> +</xsl:template> + +<xsl:template match="package" mode="all.packages"> + <tr> + <td nowrap="nowrap"> + <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + </tr> +</xsl:template> + + +<xsl:template match="metrics" mode="overview.packages"> + <html> + <head> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="''"/> + </xsl:call-template> + </head> + <body onload="open('allclasses-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> + <h3>Summary</h3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <tr> + <th><a href="metrics-reference.html#V(G)">V(G)</a></th> + <th><a href="metrics-reference.html#LOC">LOC</a></th> + <th><a href="metrics-reference.html#DIT">DIT</a></th> + <th><a href="metrics-reference.html#NOA">NOA</a></th> + <th><a href="metrics-reference.html#NRM">NRM</a></th> + <th><a href="metrics-reference.html#NLM">NLM</a></th> + <th><a href="metrics-reference.html#WMC">WMC</a></th> + <th><a href="metrics-reference.html#RFC">RFC</a></th> + <th><a href="metrics-reference.html#DAC">DAC</a></th> + <th><a href="metrics-reference.html#FANOUT">FANOUT</a></th> + <th><a href="metrics-reference.html#CBO">CBO</a></th> + <th><a href="metrics-reference.html#LCOM">LCOM</a></th> + <th><a href="metrics-reference.html#NOCL">NOCL</a></th> + </tr> + <xsl:apply-templates select="." mode="print.metrics"/> + </table> + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + Note: Metrics evaluate the quality of software by analyzing the program source and quantifying + various kind of complexity. Complexity is a common source of problems and defects in software. + High complexity makes it more difficult to develop, understand, maintain, extend, test and debug + a program. + <p/> + The primary use of metrics is to focus your attention on those parts of code that potentially are + complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial + actions. + For additional information about metrics and their meaning, please consult + Metamata Metrics manual. + </td> + </tr> + </table> + + <h3>Packages</h3> + <table border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:for-each select=".//package[not(@name = 'unnamed package')]"> + <xsl:sort select="@name" order="ascending"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </xsl:for-each> + </table> +  + <xsl:call-template name="pageFooter"/> + </body> + </html> +</xsl:template> + +<xsl:template match="package" mode="package.summary"> + <HTML> + <HEAD> + <xsl:call-template name="create.stylesheet.link"> + <xsl:with-param name="package.name" select="@name"/> + </xsl:call-template> + </HEAD> + <body onload="open('package-frame.html','classListFrame')"> + <xsl:call-template name="pageHeader"/> +  + <h3>Package <xsl:value-of select="@name"/></h3> + + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </table> + + <table border="0" width="100%"> + <tr> + <td style="text-align: justify;"> + Note: Metrics evaluate the quality of software by analyzing the program source and quantifying + various kind of complexity. Complexity is a common source of problems and defects in software. + High complexity makes it more difficult to develop, understand, maintain, extend, test and debug + a program. + <p/> + The primary use of metrics is to focus your attention on those parts of code that potentially are + complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial + actions. + For additional information about metrics and their meaning, please consult + Metamata Metrics manual. + </td> + </tr> + </table> + + <xsl:variable name="classes-in-package" select="$doctree/classes/class[@package = current()/@name]"/> + <xsl:if test="count($classes-in-package) > 0"> + <H3>Classes</H3> + <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%"> + <xsl:call-template name="all.metrics.header"/> + <xsl:for-each select="$classes-in-package"> + <xsl:sort select="@name"/> + <xsl:apply-templates select="." mode="print.metrics"/> + </xsl:for-each> + </table> + </xsl:if> + + <xsl:call-template name="pageFooter"/> + </body> + </HTML> +</xsl:template> + + + +<xsl:template name="path"> + <xsl:param name="path"/> + <xsl:if test="contains($path,'.')"> + <xsl:text>../</xsl:text> + <xsl:call-template name="path"> + <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param> + </xsl:call-template> + </xsl:if> + <xsl:if test="not(contains($path,'.')) and not($path = '')"> + <xsl:text>../</xsl:text> + </xsl:if> +</xsl:template> + + + +<xsl:template name="create.stylesheet.link"> + <xsl:param name="package.name"/> + <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK> +</xsl:template> + + + +<xsl:template name="pageHeader"> + +  + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="bannercell" rowspan="2"> + <a href="http://jakarta.apache.org/"> + <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/> + </a> + </td> + <td style="text-align:right"><h2>Source Code Metrics</h2></td> + </tr> + <tr> + <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Metrics</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td> + </tr> + </table> + <hr size="1"/> +</xsl:template> + + +<xsl:template name="pageFooter"> +</xsl:template> + + +<xsl:template name="all.metrics.header"> + <tr> + <th width="80%">Name</th> + <th nowrap="nowrap">V(G)</th> + <th>LOC</th> + <th>DIT</th> + <th>NOA</th> + <th>NRM</th> + <th>NLM</th> + <th>WMC</th> + <th>RFC</th> + <th>DAC</th> + <th>FANOUT</th> + <th>CBO</th> + <th>LCOM</th> + <th>NOCL</th> + </tr> +</xsl:template> + + +<xsl:template name="method.metrics.header"> + <tr> + <th width="80%">Name</th> + <th nowrap="nowrap">V(G)</th> + <th>LOC</th> + <th>FANOUT</th> + <th>CBO</th> + </tr> +</xsl:template> + + +<xsl:template match="method" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><xsl:apply-templates select="@name"/></td> + <td><xsl:apply-templates select="@vg"/></td> + <td><xsl:apply-templates select="@loc"/></td> + <td><xsl:apply-templates select="@fanout"/></td> + <td><xsl:apply-templates select="@cbo"/></td> + </tr> +</xsl:template> + + +<xsl:template match="class" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> + <td><a href="{(a)name}.html"><xsl:value-of select="@name"/></a></td> + <td><xsl:apply-templates select="@vg"/></td> + <td><xsl:apply-templates select="@loc"/></td> + <td><xsl:apply-templates select="@dit"/></td> + <td><xsl:apply-templates select="@noa"/></td> + <td><xsl:apply-templates select="@nrm"/></td> + <td><xsl:apply-templates select="@nlm"/></td> + <td><xsl:apply-templates select="@wmc"/></td> + <td><xsl:apply-templates select="@rfc"/></td> + <td><xsl:apply-templates select="@dac"/></td> + <td><xsl:apply-templates select="@fanout"/></td> + <td><xsl:apply-templates select="@cbo"/></td> + <td><xsl:apply-templates select="@lcom"/></td> + <td><xsl:apply-templates select="@nocl"/></td> + </tr> +</xsl:template> + +<xsl:template match="file|package" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> + <td> + <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame"> + <xsl:value-of select="@name"/> + </a> + </td> + <td><xsl:apply-templates select="@vg"/></td> + <td><xsl:apply-templates select="@loc"/></td> + <td><xsl:apply-templates select="@dit"/></td> + <td><xsl:apply-templates select="@noa"/></td> + <td><xsl:apply-templates select="@nrm"/></td> + <td><xsl:apply-templates select="@nlm"/></td> + <td><xsl:apply-templates select="@wmc"/></td> + <td><xsl:apply-templates select="@rfc"/></td> + <td><xsl:apply-templates select="@dac"/></td> + <td><xsl:apply-templates select="@fanout"/></td> + <td><xsl:apply-templates select="@cbo"/></td> + <td><xsl:apply-templates select="@lcom"/></td> + <td><xsl:apply-templates select="@nocl"/></td> + </tr> +</xsl:template> + +<xsl:template match="metrics" mode="print.metrics"> + <tr> + <xsl:call-template name="alternate-row"/> +  + <td><xsl:apply-templates select="./package/@vg"/></td> + <td><xsl:apply-templates select="./package/@loc"/></td> + <td><xsl:apply-templates select="./package/@dit"/></td> + <td><xsl:apply-templates select="./package/@noa"/></td> + <td><xsl:apply-templates select="./package/@nrm"/></td> + <td><xsl:apply-templates select="./package/@nlm"/></td> + <td><xsl:apply-templates select="./package/@wmc"/></td> + <td><xsl:apply-templates select="./package/@rfc"/></td> + <td><xsl:apply-templates select="./package/@dac"/></td> + <td><xsl:apply-templates select="./package/@fanout"/></td> + <td><xsl:apply-templates select="./package/@cbo"/></td> + <td><xsl:apply-templates select="./package/@lcom"/></td> + <td><xsl:apply-templates select="./package/@nocl"/></td> + </tr> +</xsl:template> + + +<xsl:template name="alternate-row"> +<xsl:attribute name="class"> + <xsl:if test="position() mod 2 = 1">a</xsl:if> + <xsl:if test="position() mod 2 = 0">b</xsl:if> +</xsl:attribute> +</xsl:template> + + + + + + <xsl:template match="@vg"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$vg.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@loc"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$loc.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@dit"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$dit.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@noa"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$noa.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@nrm"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$nrm.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@nlm"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$nlm.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@wmc"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$wmc.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@rfc"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$rfc.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@dac"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$dac.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@fanout"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$fanout.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@cbo"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$cbo.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@lcom"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$lcom.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template match="@nocl"> + <xsl:call-template name="display-value"> + <xsl:with-param name="value" select="current()"/> + <xsl:with-param name="max" select="$nocl.max"/> + </xsl:call-template> + </xsl:template> + + <xsl:template name="display-value"> + <xsl:param name="value"/> + <xsl:param name="max"/> + <xsl:if test="$value > $max"> + <xsl:attribute name="class">Error</xsl:attribute> + </xsl:if> + <xsl:value-of select="$value"/> + </xsl:template> + +</xsl:stylesheet> + Added: trunk/build/tools/ant/etc/tagdiff.xsl =================================================================== --- trunk/build/tools/ant/etc/tagdiff.xsl (rev 0) +++ trunk/build/tools/ant/etc/tagdiff.xsl 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,178 @@ + + +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0"> + <xsl:param name="title"/> + <xsl:param name="module"/> + <xsl:param name="cvsweb"/> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="*"> + <xsl:copy> + <xsl:copy-of select="attribute::*[. != '']"/> + <xsl:apply-templates/> + </xsl:copy> + </xsl:template> + + <xsl:template match="tagdiff"> + <html> + <head> + <title><xsl:value-of select="$title"/></title> + <style type="text/css"> + body, p { + font-family: verdana,arial,helvetica; + font-size: 80%; + color:#000000; + } + .dateAndAuthor { + font-family: verdana,arial,helvetica; + font-size: 80%; + font-weight: bold; + text-align:left; + background:#a6caf0; + } + tr, td{ + font-family: verdana,arial,helvetica; + font-size: 80%; + background:#eeeee0; + } + </style> + </head> + <body link="#000000" alink="#000000" vlink="#000000" text="#000000"> + <h1> + <a name="top"><xsl:value-of select="$title"/></a> + </h1> + Tagdiff between <xsl:value-of select="@startTag"/> <xsl:value-of select="@startDate"/> and + <xsl:value-of select="@endTag"/> <xsl:value-of select="@endDate"/> + <p align="right">Designed for use with <a href="http://ant.apache.org/">Ant</a>.</p> + <hr size="2"/> + <a name="TOP"/> + <table width="100%"> + <tr> + <td align="right"> + <a href="#New">New Files</a> | + <a href="#Modified">Modified Files</a> | + <a href="#Removed">Removed Files</a> + </td> + </tr> + </table> + <table border="0" width="100%" cellpadding="3" cellspacing="1"> + <xsl:call-template name="show-entries"> + <xsl:with-param name="title">New Files</xsl:with-param> + <xsl:with-param name="anchor">New</xsl:with-param> + <xsl:with-param name="entries" select=".//entry[file/revision][not(file/prevrevision)]"/> + </xsl:call-template> + + <xsl:call-template name="show-entries"> + <xsl:with-param name="title">Modified Files</xsl:with-param> + <xsl:with-param name="anchor">Modified</xsl:with-param> + <xsl:with-param name="entries" select=".//entry[file/revision][file/prevrevision]"/> + </xsl:call-template> + +  + <xsl:call-template name="show-entries"> + <xsl:with-param name="title">Removed Files</xsl:with-param> + <xsl:with-param name="anchor">Removed</xsl:with-param> + <xsl:with-param name="entries" select=".//entry[not(file/revision)][file/prevrevision]"/> + </xsl:call-template> + </table> + + </body> + </html> + </xsl:template> + + <xsl:template name="show-entries"> + <xsl:param name="title"/> + <xsl:param name="anchor"/> + <xsl:param name="entries"/> + <tr> + <td colspan="2" class="dateAndAuthor"> + <a> + <xsl:attribute name="name"><xsl:value-of select="$anchor"/></xsl:attribute> + <xsl:value-of select="$title"/> - <xsl:value-of select="count($entries)"/> entries + </a> + <a href="#TOP">(back to top)</a> + </td> + </tr> + <tr> + <td width="20"> + <xsl:text> </xsl:text> + </td> + <td> + <ul> + <xsl:apply-templates select="$entries"/> + </ul> + </td> + </tr> + </xsl:template> + + <xsl:template match="entry"> + <xsl:apply-templates select="file"/> + </xsl:template> + + <xsl:template match="date"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="time"> + <i><xsl:value-of select="."/></i> + </xsl:template> + + <xsl:template match="author"> + <i> + <a> + <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute> + <xsl:value-of select="."/> + </a> + </i> + </xsl:template> + + <xsl:template match="file"> + <li> + <a target="_new"> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" /></xsl:attribute> + <xsl:value-of select="name" /> + </a> + <xsl:if test="string-length(prevrevision) > 0 or string-length(revision) > 0"> + <xsl:text> </xsl:text> + <a target="_new"> + <xsl:choose> + <xsl:when test="string-length(prevrevision) = 0 "> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&content-type=text/x-cvsweb-markup</xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/>&diff_format=h</xsl:attribute> + </xsl:otherwise> + </xsl:choose> (<xsl:value-of select="revision"/>) + </a> + </xsl:if> + </li> + </xsl:template> + +  + <xsl:template match="msg"> + <b><xsl:apply-templates/></b> + </xsl:template> + +</xsl:stylesheet> Added: trunk/build/tools/ant/lib/README =================================================================== --- trunk/build/tools/ant/lib/README (rev 0) +++ trunk/build/tools/ant/lib/README 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,15 @@ +Please refer to the Ant manual under Installing Ant / Library +Dependencies for a list of the jar requirements for various optional +tasks and features. + +This directory contains xercesImpl.jar from the 2.6.2 release of +Apache Xerces. For more information or newer releases see +<http://xml.apache.org/xerces2-j/>. See the file LICENSE.xerces for +the terms of distribution. + +It also contains xml-apis.jar, an Apache-controlled collection of +standard classes from the 1.0b2 release of the Apache XML-Commons +release. For more information or newer releases see +<http://xml.apache.org/commons/>. See the files LICENSE.dom and +LICENSE.sax for the terms of distribution. + Added: trunk/build/tools/ant/lib/ant-antlr.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-antlr.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-apache-bcel.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-apache-bcel.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-apache-bsf.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-apache-bsf.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-apache-log4j.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-apache-log4j.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-apache-oro.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-apache-oro.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-apache-regexp.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-apache-regexp.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-apache-resolver.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-apache-resolver.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-commons-net.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-commons-net.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-jai.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-jai.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-javamail.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-javamail.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-jdepend.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-jdepend.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-jmf.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-jmf.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-jsch.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-jsch.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-junit.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-junit.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-launcher.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-launcher.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-netrexx.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-netrexx.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-nodeps.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-nodeps.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-starteam.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-starteam.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-stylebook.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-stylebook.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-swing.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-swing.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-testutil.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-testutil.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-trax.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-trax.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant-weblogic.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant-weblogic.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/ant.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/ant.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/junit.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/junit.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/libraries.properties =================================================================== --- trunk/build/tools/ant/lib/libraries.properties (rev 0) +++ trunk/build/tools/ant/lib/libraries.properties 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,46 @@ +#this file declares the libraries for use in +#a given release of the components + +#if you change this, change the checksum to match +m2.version=2.0.4 +m2.url=http://ibiblio.org/maven2/ +m2.artifact-name=maven-artifact-ant +m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar +#this is the URL of the antlib library, that is pulled down for everything else. +m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.jar.name} +#this is the sha1 checksum of the artifact +m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50 + + +#versions of different libraries. Please keep in alphabetical order, except +#when a specific dependency forces them to be out-of-order +antlr.version=2.7.2 +bcel.version=5.1 +bsf.version=2.4.0 +bsh.version=2.0b4 +bsh-core.version=${bsh.version} +commons-net.version=1.4.0 +commons-logging.version=1.0.4 +commons-logging-api.version=${commons-logging.version} +jdepend.version=2.7 +jruby.version=0.8.3 +junit.version=3.8.2 +jsch.version=0.1.29 +jython.version=2.1 +log4j.version=1.2.13 +#js is the javascript implementation of the rhino project +js.version=1.6R3 +oro.version=2.0.8 +regexp.version=1.3 +which.version=1.0 +xerces.version=2.8.1 +xercesImpl.version=${xerces.version} +#should be in sync w/ xerces, but not in the maven repository +#xmlParserAPIs.version=${xerces.version} +xmlParserAPIs.version=2.6.1 +xalan.version=2.7.0 +xml-resolver.version=1.1 + +#paired +jacl.version=1.2.6 +tcljava.version=${jacl.version} Added: trunk/build/tools/ant/lib/xercesImpl.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/xercesImpl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/build/tools/ant/lib/xml-apis.jar =================================================================== (Binary files differ) Property changes on: trunk/build/tools/ant/lib/xml-apis.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/integration/native/build.bat =================================================================== --- trunk/integration/native/build.bat (rev 0) +++ trunk/integration/native/build.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,109 @@ +@echo off + +REM ====================================================================== +REM +REM This is the main entry point for the build system. +REM +REM Users should be sure to execute this file rather than 'ant' to ensure +REM the correct version is being used with the correct configuration. +REM +REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 +REM +REM ====================================================================== +REM +REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ + +REM ****************************************************** +REM Ignore the ANT_HOME variable: we want to use *our* +REM ANT version and associated JARs. +REM ****************************************************** +REM Ignore the users classpath, cause it might mess +REM things up +REM ****************************************************** + +SETLOCAL + +set NOPAUSE=true +set CLASSPATH= +set ANT_HOME= + +set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat + +REM ****************************************************** +REM JDK 6 Settings +REM Uncomment when using JDK 6 +REM ****************************************************** +REM set USE_JDK6=true + +REM +REM - "for" loops have been unrolled for compatibility +REM with some WIN32 systems. +REM ****************************************************** + +set NAMES=build\tools;build\tools\ant;build\tools\apache\ant +set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. + +REM ****************************************************** +REM ********Save the command line arguments*************** +REM ****************************************************** +set BUILD_ARGS=%1 +if ""%1""=="""" goto completedArgs +shift +:processArg +if ""%1""=="""" goto completedArgs +set BUILD_ARGS=%BUILD_ARGS% %1 +shift +goto processArg + +:completedArgs + +REM ****************************************************** +REM ****************************************************** + +SET EXECUTED=FALSE +for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ********* Search for names in the subfolders ********* +REM ****************************************************** + +:subLoop +for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************ Test if ANT Batch file exists *********** +REM ****************************************************** + +:testIfExists +if exist %1 call :BatchFound %1 %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************** Batch file has been found ************* +REM ****************************************************** + +:BatchFound +if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% +set EXECUTED=TRUE + +goto :EOF + +REM ****************************************************** +REM ************* Execute Batch file only once *********** +REM ****************************************************** + +:ExecuteBatch +echo Calling %1 %BUILD_ARGS% + +REM set ENDORSED= +call %1 %BUILD_ARGS% + +:end + +if "%NOPAUSE%" == "" pause + Property changes on: trunk/integration/native/build.bat ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/native/build.sh =================================================================== --- trunk/integration/native/build.sh (rev 0) +++ trunk/integration/native/build.sh 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,187 @@ +#!/bin/sh +### ====================================================================== ### +## ## +## This is the main entry point for the build system. ## +## ## +## Users should be sure to execute this file rather than 'ant' to ensure ## +## the correct version is being used with the correct configuration. ## +## ## +## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## +## ## +### ====================================================================== ### + +# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` +GREP="grep" +ROOT="/" + +# Ignore user's ANT_HOME if it is set +ANT_HOME="" + +# Uncomment when using JDK 6 +#USE_JDK6=true + +# the default search path for ant +ANT_SEARCH_PATH="\ + tools + tools/ant \ + tools/apache/ant \ + ant \ + ../build/tools/ant \ + ../../build/tools/ant \ + ../../../build/tools/ant " + +# the default build file name +ANT_BUILD_FILE="build.xml" + +# the default arguments +ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + + Darwin*) + darwin=true + ;; +esac + +# +# Helper to complain. +# +die() { + echo "${PROGNAME}: $*" + exit 1 +} + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to source a file if it exists. +# +maybe_source() { + for file in $*; do + if [ -f "$file" ]; then + . $file + fi + done +} + +search() { + search="$*" + for d in $search; do + ANT_HOME="`pwd`/$d" + ANT="$ANT_HOME/bin/ant" + if [ -x "$ANT" ]; then + # found one + echo $ANT_HOME + break + fi + done +} + +# +# Main function. +# +main() { + # if there is a build config file. then source it + maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf" + + # Increase the maximum file descriptors if we can + if [ $cygwin = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + # use the system max + MAX_FD="$MAX_FD_LIMIT" + fi + + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi + fi + + # try the search path + ANT_HOME=`search $ANT_SEARCH_PATH` + + # try looking up to root + if [ "x$ANT_HOME" = "x" ]; then + target="build" + _cwd=`pwd` + + while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do + cd .. + cwd=`pwd` + ANT_HOME=`search $ANT_SEARCH_PATH` + done + + # make sure we get back + cd $_cwd + + if [ "$cwd" != "$ROOT" ]; then + found="true" + fi + + # complain if we did not find anything + if [ "$found" != "true" ]; then + die "Could not locate Ant; check \$ANT or \$ANT_HOME." + fi + fi + + # make sure we have one + ANT=$ANT_HOME/bin/ant + if [ ! -x "$ANT" ]; then + die "Ant file is not executable: $ANT" + fi + + # Set the max memory to 256m + ANT_OPTS=-Xmx256m + + if [ "x$USE_JDK6" = "xtrue" ]; then + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" + echo "--------------------------------------" + echo "Endorsed Directory: $ANT_HOME/endorsed" + echo "--------------------------------------" + fi + + # setup some build properties + ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" + + # change to the directory where the script lives so users are not forced + # to be in the same directory as build.xml + cd $DIRNAME + + # export some stuff for ant + export ANT ANT_HOME ANT_OPTS + + # execute in debug mode, or simply execute + if [ "x$ANT_DEBUG" != "x" ]; then + /bin/sh -x $ANT $ANT_OPTIONS "$@" + else + exec $ANT $ANT_OPTIONS "$@" + fi +} + +## +## Bootstrap +## + +main "$@" Property changes on: trunk/integration/native/build.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/spi/build.bat =================================================================== --- trunk/integration/spi/build.bat (rev 0) +++ trunk/integration/spi/build.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,109 @@ +@echo off + +REM ====================================================================== +REM +REM This is the main entry point for the build system. +REM +REM Users should be sure to execute this file rather than 'ant' to ensure +REM the correct version is being used with the correct configuration. +REM +REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 +REM +REM ====================================================================== +REM +REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ + +REM ****************************************************** +REM Ignore the ANT_HOME variable: we want to use *our* +REM ANT version and associated JARs. +REM ****************************************************** +REM Ignore the users classpath, cause it might mess +REM things up +REM ****************************************************** + +SETLOCAL + +set NOPAUSE=true +set CLASSPATH= +set ANT_HOME= + +set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat + +REM ****************************************************** +REM JDK 6 Settings +REM Uncomment when using JDK 6 +REM ****************************************************** +REM set USE_JDK6=true + +REM +REM - "for" loops have been unrolled for compatibility +REM with some WIN32 systems. +REM ****************************************************** + +set NAMES=build\tools;build\tools\ant;build\tools\apache\ant +set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. + +REM ****************************************************** +REM ********Save the command line arguments*************** +REM ****************************************************** +set BUILD_ARGS=%1 +if ""%1""=="""" goto completedArgs +shift +:processArg +if ""%1""=="""" goto completedArgs +set BUILD_ARGS=%BUILD_ARGS% %1 +shift +goto processArg + +:completedArgs + +REM ****************************************************** +REM ****************************************************** + +SET EXECUTED=FALSE +for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ********* Search for names in the subfolders ********* +REM ****************************************************** + +:subLoop +for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************ Test if ANT Batch file exists *********** +REM ****************************************************** + +:testIfExists +if exist %1 call :BatchFound %1 %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************** Batch file has been found ************* +REM ****************************************************** + +:BatchFound +if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% +set EXECUTED=TRUE + +goto :EOF + +REM ****************************************************** +REM ************* Execute Batch file only once *********** +REM ****************************************************** + +:ExecuteBatch +echo Calling %1 %BUILD_ARGS% + +REM set ENDORSED= +call %1 %BUILD_ARGS% + +:end + +if "%NOPAUSE%" == "" pause + Property changes on: trunk/integration/spi/build.bat ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/spi/build.sh =================================================================== --- trunk/integration/spi/build.sh (rev 0) +++ trunk/integration/spi/build.sh 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,187 @@ +#!/bin/sh +### ====================================================================== ### +## ## +## This is the main entry point for the build system. ## +## ## +## Users should be sure to execute this file rather than 'ant' to ensure ## +## the correct version is being used with the correct configuration. ## +## ## +## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## +## ## +### ====================================================================== ### + +# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` +GREP="grep" +ROOT="/" + +# Ignore user's ANT_HOME if it is set +ANT_HOME="" + +# Uncomment when using JDK 6 +#USE_JDK6=true + +# the default search path for ant +ANT_SEARCH_PATH="\ + tools + tools/ant \ + tools/apache/ant \ + ant \ + ../build/tools/ant \ + ../../build/tools/ant \ + ../../../build/tools/ant " + +# the default build file name +ANT_BUILD_FILE="build.xml" + +# the default arguments +ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + + Darwin*) + darwin=true + ;; +esac + +# +# Helper to complain. +# +die() { + echo "${PROGNAME}: $*" + exit 1 +} + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to source a file if it exists. +# +maybe_source() { + for file in $*; do + if [ -f "$file" ]; then + . $file + fi + done +} + +search() { + search="$*" + for d in $search; do + ANT_HOME="`pwd`/$d" + ANT="$ANT_HOME/bin/ant" + if [ -x "$ANT" ]; then + # found one + echo $ANT_HOME + break + fi + done +} + +# +# Main function. +# +main() { + # if there is a build config file. then source it + maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf" + + # Increase the maximum file descriptors if we can + if [ $cygwin = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + # use the system max + MAX_FD="$MAX_FD_LIMIT" + fi + + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi + fi + + # try the search path + ANT_HOME=`search $ANT_SEARCH_PATH` + + # try looking up to root + if [ "x$ANT_HOME" = "x" ]; then + target="build" + _cwd=`pwd` + + while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do + cd .. + cwd=`pwd` + ANT_HOME=`search $ANT_SEARCH_PATH` + done + + # make sure we get back + cd $_cwd + + if [ "$cwd" != "$ROOT" ]; then + found="true" + fi + + # complain if we did not find anything + if [ "$found" != "true" ]; then + die "Could not locate Ant; check \$ANT or \$ANT_HOME." + fi + fi + + # make sure we have one + ANT=$ANT_HOME/bin/ant + if [ ! -x "$ANT" ]; then + die "Ant file is not executable: $ANT" + fi + + # Set the max memory to 256m + ANT_OPTS=-Xmx256m + + if [ "x$USE_JDK6" = "xtrue" ]; then + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" + echo "--------------------------------------" + echo "Endorsed Directory: $ANT_HOME/endorsed" + echo "--------------------------------------" + fi + + # setup some build properties + ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" + + # change to the directory where the script lives so users are not forced + # to be in the same directory as build.xml + cd $DIRNAME + + # export some stuff for ant + export ANT ANT_HOME ANT_OPTS + + # execute in debug mode, or simply execute + if [ "x$ANT_DEBUG" != "x" ]; then + /bin/sh -x $ANT $ANT_OPTIONS "$@" + else + exec $ANT $ANT_OPTIONS "$@" + fi +} + +## +## Bootstrap +## + +main "$@" Property changes on: trunk/integration/spi/build.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/sunri/build.bat =================================================================== --- trunk/integration/sunri/build.bat (rev 0) +++ trunk/integration/sunri/build.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,109 @@ +@echo off + +REM ====================================================================== +REM +REM This is the main entry point for the build system. +REM +REM Users should be sure to execute this file rather than 'ant' to ensure +REM the correct version is being used with the correct configuration. +REM +REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 +REM +REM ====================================================================== +REM +REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ + +REM ****************************************************** +REM Ignore the ANT_HOME variable: we want to use *our* +REM ANT version and associated JARs. +REM ****************************************************** +REM Ignore the users classpath, cause it might mess +REM things up +REM ****************************************************** + +SETLOCAL + +set NOPAUSE=true +set CLASSPATH= +set ANT_HOME= + +set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat + +REM ****************************************************** +REM JDK 6 Settings +REM Uncomment when using JDK 6 +REM ****************************************************** +REM set USE_JDK6=true + +REM +REM - "for" loops have been unrolled for compatibility +REM with some WIN32 systems. +REM ****************************************************** + +set NAMES=build\tools;build\tools\ant;build\tools\apache\ant +set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. + +REM ****************************************************** +REM ********Save the command line arguments*************** +REM ****************************************************** +set BUILD_ARGS=%1 +if ""%1""=="""" goto completedArgs +shift +:processArg +if ""%1""=="""" goto completedArgs +set BUILD_ARGS=%BUILD_ARGS% %1 +shift +goto processArg + +:completedArgs + +REM ****************************************************** +REM ****************************************************** + +SET EXECUTED=FALSE +for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ********* Search for names in the subfolders ********* +REM ****************************************************** + +:subLoop +for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************ Test if ANT Batch file exists *********** +REM ****************************************************** + +:testIfExists +if exist %1 call :BatchFound %1 %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************** Batch file has been found ************* +REM ****************************************************** + +:BatchFound +if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% +set EXECUTED=TRUE + +goto :EOF + +REM ****************************************************** +REM ************* Execute Batch file only once *********** +REM ****************************************************** + +:ExecuteBatch +echo Calling %1 %BUILD_ARGS% + +REM set ENDORSED= +call %1 %BUILD_ARGS% + +:end + +if "%NOPAUSE%" == "" pause + Property changes on: trunk/integration/sunri/build.bat ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/sunri/build.sh =================================================================== --- trunk/integration/sunri/build.sh (rev 0) +++ trunk/integration/sunri/build.sh 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,187 @@ +#!/bin/sh +### ====================================================================== ### +## ## +## This is the main entry point for the build system. ## +## ## +## Users should be sure to execute this file rather than 'ant' to ensure ## +## the correct version is being used with the correct configuration. ## +## ## +## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## +## ## +### ====================================================================== ### + +# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` +GREP="grep" +ROOT="/" + +# Ignore user's ANT_HOME if it is set +ANT_HOME="" + +# Uncomment when using JDK 6 +#USE_JDK6=true + +# the default search path for ant +ANT_SEARCH_PATH="\ + tools + tools/ant \ + tools/apache/ant \ + ant \ + ../build/tools/ant \ + ../../build/tools/ant \ + ../../../build/tools/ant " + +# the default build file name +ANT_BUILD_FILE="build.xml" + +# the default arguments +ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + + Darwin*) + darwin=true + ;; +esac + +# +# Helper to complain. +# +die() { + echo "${PROGNAME}: $*" + exit 1 +} + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to source a file if it exists. +# +maybe_source() { + for file in $*; do + if [ -f "$file" ]; then + . $file + fi + done +} + +search() { + search="$*" + for d in $search; do + ANT_HOME="`pwd`/$d" + ANT="$ANT_HOME/bin/ant" + if [ -x "$ANT" ]; then + # found one + echo $ANT_HOME + break + fi + done +} + +# +# Main function. +# +main() { + # if there is a build config file. then source it + maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf" + + # Increase the maximum file descriptors if we can + if [ $cygwin = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + # use the system max + MAX_FD="$MAX_FD_LIMIT" + fi + + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi + fi + + # try the search path + ANT_HOME=`search $ANT_SEARCH_PATH` + + # try looking up to root + if [ "x$ANT_HOME" = "x" ]; then + target="build" + _cwd=`pwd` + + while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do + cd .. + cwd=`pwd` + ANT_HOME=`search $ANT_SEARCH_PATH` + done + + # make sure we get back + cd $_cwd + + if [ "$cwd" != "$ROOT" ]; then + found="true" + fi + + # complain if we did not find anything + if [ "$found" != "true" ]; then + die "Could not locate Ant; check \$ANT or \$ANT_HOME." + fi + fi + + # make sure we have one + ANT=$ANT_HOME/bin/ant + if [ ! -x "$ANT" ]; then + die "Ant file is not executable: $ANT" + fi + + # Set the max memory to 256m + ANT_OPTS=-Xmx256m + + if [ "x$USE_JDK6" = "xtrue" ]; then + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" + echo "--------------------------------------" + echo "Endorsed Directory: $ANT_HOME/endorsed" + echo "--------------------------------------" + fi + + # setup some build properties + ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" + + # change to the directory where the script lives so users are not forced + # to be in the same directory as build.xml + cd $DIRNAME + + # export some stuff for ant + export ANT ANT_HOME ANT_OPTS + + # execute in debug mode, or simply execute + if [ "x$ANT_DEBUG" != "x" ]; then + /bin/sh -x $ANT $ANT_OPTIONS "$@" + else + exec $ANT $ANT_OPTIONS "$@" + fi +} + +## +## Bootstrap +## + +main "$@" Property changes on: trunk/integration/sunri/build.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/xfire/build.bat =================================================================== --- trunk/integration/xfire/build.bat (rev 0) +++ trunk/integration/xfire/build.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,109 @@ +@echo off + +REM ====================================================================== +REM +REM This is the main entry point for the build system. +REM +REM Users should be sure to execute this file rather than 'ant' to ensure +REM the correct version is being used with the correct configuration. +REM +REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 +REM +REM ====================================================================== +REM +REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ + +REM ****************************************************** +REM Ignore the ANT_HOME variable: we want to use *our* +REM ANT version and associated JARs. +REM ****************************************************** +REM Ignore the users classpath, cause it might mess +REM things up +REM ****************************************************** + +SETLOCAL + +set NOPAUSE=true +set CLASSPATH= +set ANT_HOME= + +set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat + +REM ****************************************************** +REM JDK 6 Settings +REM Uncomment when using JDK 6 +REM ****************************************************** +REM set USE_JDK6=true + +REM +REM - "for" loops have been unrolled for compatibility +REM with some WIN32 systems. +REM ****************************************************** + +set NAMES=build\tools;build\tools\ant;build\tools\apache\ant +set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. + +REM ****************************************************** +REM ********Save the command line arguments*************** +REM ****************************************************** +set BUILD_ARGS=%1 +if ""%1""=="""" goto completedArgs +shift +:processArg +if ""%1""=="""" goto completedArgs +set BUILD_ARGS=%BUILD_ARGS% %1 +shift +goto processArg + +:completedArgs + +REM ****************************************************** +REM ****************************************************** + +SET EXECUTED=FALSE +for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ********* Search for names in the subfolders ********* +REM ****************************************************** + +:subLoop +for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************ Test if ANT Batch file exists *********** +REM ****************************************************** + +:testIfExists +if exist %1 call :BatchFound %1 %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************** Batch file has been found ************* +REM ****************************************************** + +:BatchFound +if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% +set EXECUTED=TRUE + +goto :EOF + +REM ****************************************************** +REM ************* Execute Batch file only once *********** +REM ****************************************************** + +:ExecuteBatch +echo Calling %1 %BUILD_ARGS% + +REM set ENDORSED= +call %1 %BUILD_ARGS% + +:end + +if "%NOPAUSE%" == "" pause + Property changes on: trunk/integration/xfire/build.bat ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/xfire/build.sh =================================================================== --- trunk/integration/xfire/build.sh (rev 0) +++ trunk/integration/xfire/build.sh 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,187 @@ +#!/bin/sh +### ====================================================================== ### +## ## +## This is the main entry point for the build system. ## +## ## +## Users should be sure to execute this file rather than 'ant' to ensure ## +## the correct version is being used with the correct configuration. ## +## ## +## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## +## ## +### ====================================================================== ### + +# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` +GREP="grep" +ROOT="/" + +# Ignore user's ANT_HOME if it is set +ANT_HOME="" + +# Uncomment when using JDK 6 +#USE_JDK6=true + +# the default search path for ant +ANT_SEARCH_PATH="\ + tools + tools/ant \ + tools/apache/ant \ + ant \ + ../build/tools/ant \ + ../../build/tools/ant \ + ../../../build/tools/ant " + +# the default build file name +ANT_BUILD_FILE="build.xml" + +# the default arguments +ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + + Darwin*) + darwin=true + ;; +esac + +# +# Helper to complain. +# +die() { + echo "${PROGNAME}: $*" + exit 1 +} + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to source a file if it exists. +# +maybe_source() { + for file in $*; do + if [ -f "$file" ]; then + . $file + fi + done +} + +search() { + search="$*" + for d in $search; do + ANT_HOME="`pwd`/$d" + ANT="$ANT_HOME/bin/ant" + if [ -x "$ANT" ]; then + # found one + echo $ANT_HOME + break + fi + done +} + +# +# Main function. +# +main() { + # if there is a build config file. then source it + maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf" + + # Increase the maximum file descriptors if we can + if [ $cygwin = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + # use the system max + MAX_FD="$MAX_FD_LIMIT" + fi + + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi + fi + + # try the search path + ANT_HOME=`search $ANT_SEARCH_PATH` + + # try looking up to root + if [ "x$ANT_HOME" = "x" ]; then + target="build" + _cwd=`pwd` + + while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do + cd .. + cwd=`pwd` + ANT_HOME=`search $ANT_SEARCH_PATH` + done + + # make sure we get back + cd $_cwd + + if [ "$cwd" != "$ROOT" ]; then + found="true" + fi + + # complain if we did not find anything + if [ "$found" != "true" ]; then + die "Could not locate Ant; check \$ANT or \$ANT_HOME." + fi + fi + + # make sure we have one + ANT=$ANT_HOME/bin/ant + if [ ! -x "$ANT" ]; then + die "Ant file is not executable: $ANT" + fi + + # Set the max memory to 256m + ANT_OPTS=-Xmx256m + + if [ "x$USE_JDK6" = "xtrue" ]; then + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" + echo "--------------------------------------" + echo "Endorsed Directory: $ANT_HOME/endorsed" + echo "--------------------------------------" + fi + + # setup some build properties + ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" + + # change to the directory where the script lives so users are not forced + # to be in the same directory as build.xml + cd $DIRNAME + + # export some stuff for ant + export ANT ANT_HOME ANT_OPTS + + # execute in debug mode, or simply execute + if [ "x$ANT_DEBUG" != "x" ]; then + /bin/sh -x $ANT $ANT_OPTIONS "$@" + else + exec $ANT $ANT_OPTIONS "$@" + fi +} + +## +## Bootstrap +## + +main "$@" Property changes on: trunk/integration/xfire/build.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/jbossws-core/build.bat =================================================================== --- trunk/jbossws-core/build.bat (rev 0) +++ trunk/jbossws-core/build.bat 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,109 @@ +@echo off + +REM ====================================================================== +REM +REM This is the main entry point for the build system. +REM +REM Users should be sure to execute this file rather than 'ant' to ensure +REM the correct version is being used with the correct configuration. +REM +REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 +REM +REM ====================================================================== +REM +REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ + +REM ****************************************************** +REM Ignore the ANT_HOME variable: we want to use *our* +REM ANT version and associated JARs. +REM ****************************************************** +REM Ignore the users classpath, cause it might mess +REM things up +REM ****************************************************** + +SETLOCAL + +set NOPAUSE=true +set CLASSPATH= +set ANT_HOME= + +set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat + +REM ****************************************************** +REM JDK 6 Settings +REM Uncomment when using JDK 6 +REM ****************************************************** +REM set USE_JDK6=true + +REM +REM - "for" loops have been unrolled for compatibility +REM with some WIN32 systems. +REM ****************************************************** + +set NAMES=build\tools;build\tools\ant;build\tools\apache\ant +set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. + +REM ****************************************************** +REM ********Save the command line arguments*************** +REM ****************************************************** +set BUILD_ARGS=%1 +if ""%1""=="""" goto completedArgs +shift +:processArg +if ""%1""=="""" goto completedArgs +set BUILD_ARGS=%BUILD_ARGS% %1 +shift +goto processArg + +:completedArgs + +REM ****************************************************** +REM ****************************************************** + +SET EXECUTED=FALSE +for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ********* Search for names in the subfolders ********* +REM ****************************************************** + +:subLoop +for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************ Test if ANT Batch file exists *********** +REM ****************************************************** + +:testIfExists +if exist %1 call :BatchFound %1 %BUILD_ARGS% + +goto :EOF + +REM ****************************************************** +REM ************** Batch file has been found ************* +REM ****************************************************** + +:BatchFound +if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% +set EXECUTED=TRUE + +goto :EOF + +REM ****************************************************** +REM ************* Execute Batch file only once *********** +REM ****************************************************** + +:ExecuteBatch +echo Calling %1 %BUILD_ARGS% + +REM set ENDORSED= +call %1 %BUILD_ARGS% + +:end + +if "%NOPAUSE%" == "" pause + Property changes on: trunk/jbossws-core/build.bat ___________________________________________________________________ Name: svn:executable + * Added: trunk/jbossws-core/build.sh =================================================================== --- trunk/jbossws-core/build.sh (rev 0) +++ trunk/jbossws-core/build.sh 2007-06-15 13:15:06 UTC (rev 3594) @@ -0,0 +1,187 @@ +#!/bin/sh +### ====================================================================== ### +## ## +## This is the main entry point for the build system. ## +## ## +## Users should be sure to execute this file rather than 'ant' to ensure ## +## the correct version is being used with the correct configuration. ## +## ## +## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## +## ## +### ====================================================================== ### + +# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` +GREP="grep" +ROOT="/" + +# Ignore user's ANT_HOME if it is set +ANT_HOME="" + +# Uncomment when using JDK 6 +#USE_JDK6=true + +# the default search path for ant +ANT_SEARCH_PATH="\ + tools + tools/ant \ + tools/apache/ant \ + ant \ + ../build/tools/ant \ + ../../build/tools/ant \ + ../../../build/tools/ant " + +# the default build file name +ANT_BUILD_FILE="build.xml" + +# the default arguments +ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +darwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; + + Darwin*) + darwin=true + ;; +esac + +# +# Helper to complain. +# +die() { + echo "${PROGNAME}: $*" + exit 1 +} + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to source a file if it exists. +# +maybe_source() { + for file in $*; do + if [ -f "$file" ]; then + . $file + fi + done +} + +search() { + search="$*" + for d in $search; do + ANT_HOME="`pwd`/$d" + ANT="$ANT_HOME/bin/ant" + if [ -x "$ANT" ]; then + # found one + echo $ANT_HOME + break + fi + done +} + +# +# Main function. +# +main() { + # if there is a build config file. then source it + maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf" + + # Increase the maximum file descriptors if we can + if [ $cygwin = "false" ]; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + # use the system max + MAX_FD="$MAX_FD_LIMIT" + fi + + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" + fi + fi + + # try the search path + ANT_HOME=`search $ANT_SEARCH_PATH` + + # try looking up to root + if [ "x$ANT_HOME" = "x" ]; then + target="build" + _cwd=`pwd` + + while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do + cd .. + cwd=`pwd` + ANT_HOME=`search $ANT_SEARCH_PATH` + done + + # make sure we get back + cd $_cwd + + if [ "$cwd" != "$ROOT" ]; then + found="true" + fi + + # complain if we did not find anything + if [ "$found" != "true" ]; then + die "Could not locate Ant; check \$ANT or \$ANT_HOME." + fi + fi + + # make sure we have one + ANT=$ANT_HOME/bin/ant + if [ ! -x "$ANT" ]; then + die "Ant file is not executable: $ANT" + fi + + # Set the max memory to 256m + ANT_OPTS=-Xmx256m + + if [ "x$USE_JDK6" = "xtrue" ]; then + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" + echo "--------------------------------------" + echo "Endorsed Directory: $ANT_HOME/endorsed" + echo "--------------------------------------" + fi + + # setup some build properties + ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" + + # change to the directory where the script lives so users are not forced + # to be in the same directory as build.xml + cd $DIRNAME + + # export some stuff for ant + export ANT ANT_HOME ANT_OPTS + + # execute in debug mode, or simply execute + if [ "x$ANT_DEBUG" != "x" ]; then + /bin/sh -x $ANT $ANT_OPTIONS "$@" + else + exec $ANT $ANT_OPTIONS "$@" + fi +} + +## +## Bootstrap +## + +main "$@"

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3593 - branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-15 08:52:48 -0400 (Fri, 15 Jun 2007) New Revision: 3593 Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java Log: Fix classpath for AS50 Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2007-06-15 12:42:58 UTC (rev 3592) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2007-06-15 12:52:48 UTC (rev 3593) @@ -62,7 +62,10 @@ // Maybe you should extend the Class-Path in the MANIFEST instead. StringBuffer cp = new StringBuffer("./classes"); cp.append(":" + jbc + "/jbossws-client.jar"); - cp.append(":" + jbc + "/jboss-common-client.jar"); + if (isTargetJBoss50()) + cp.append(":" + jbc + "/jboss-common-core.jar"); + else + cp.append(":" + jbc + "/jboss-common-client.jar"); Runtime rt = Runtime.getRuntime();

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3592 - in branches/jbossws-2.0: jbossws-core/ant-import-tests and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-15 08:42:58 -0400 (Fri, 15 Jun 2007) New Revision: 3592 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/ Removed: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/wsdl/ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/WEB-INF/ Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml Log: [JBWS-1556] @WebWservice does not work with class isolation Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html 2007-06-15 08:02:07 UTC (rev 3591) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html 2007-06-15 12:42:58 UTC (rev 3592) @@ -1,6 +1,6 @@ <html><head> <meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> -<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title> +<title>JBossWS</title> <link rel='stylesheet' href='./styles.css'> </head> <body> @@ -33,9 +33,9 @@ <ul> <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> - <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ</a></li> - <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html">User guide</a></li> - <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS WIKI</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li> </ul> </fieldset> Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-15 08:02:07 UTC (rev 3591) +++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-15 12:42:58 UTC (rev 3592) @@ -206,6 +206,22 @@ </classes> </war> +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1556.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF"> + <include name="application.xml"/> + <include name="jboss-app.xml"/> + </metainf> + </jar> +  <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar"> <fileset dir="${tests.output.dir}/classes"> Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-15 08:02:07 UTC (rev 3591) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-15 12:42:58 UTC (rev 3592) @@ -137,7 +137,13 @@ wsdlService = wsdlDefinitions.getService(serviceName); } if (wsdlService == null) - throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceName); + { + List<QName> serviceNames = new ArrayList<QName>(); + for (WSDLService wsdls : wsdlDefinitions.getServices()) + serviceNames.add(wsdls.getName()); + + throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceName + " we have " + serviceNames); + } // Build endpoint meta data Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java 2007-06-15 12:42:58 UTC (rev 3592) @@ -0,0 +1,43 @@ +/* + * 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.test.ws.jaxws.jbws1556; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +@Stateless + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +@WebContext(contextRoot = "jaxws-jbws1556") +public class EJB3Bean +{ + @WebMethod + public String hello(String msg) + { + return msg; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java 2007-06-15 12:42:58 UTC (rev 3592) @@ -0,0 +1,20 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 02 21:17:37 CET 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jaxws.jbws1556; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface +{ + String hello(String msg); +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2007-06-15 12:42:58 UTC (rev 3592) @@ -0,0 +1,58 @@ +/* + * 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.test.ws.jaxws.jbws1556; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * [JBWS-1556] @WebWservice does not work with class isolation + * + * http://jira.jboss.org/jira/browse/JBWS-1556 + * + * @author Thomas.Diesler(a)jboss.com + * @since 15-Jun-2007 + */ +public class JBWS1556EarTestCase extends JBossWSTest +{ + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear"); + } + + public void testEndpointAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1556/EJB3Bean?wsdl"); + QName serviceName = new QName("http://jbws1556.jaxws.ws.test.jboss.org/", "EJB3BeanService"); + Service service = Service.create(wsdlURL, serviceName); + EndpointInterface port = service.getPort(EndpointInterface.class); + String hello = port.hello("hello"); + assertEquals("hello", hello); + } +} \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556 (from rev 3591, branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1581) Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1581/META-INF/application.xml 2007-06-15 08:02:07 UTC (rev 3591) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml 2007-06-15 12:42:58 UTC (rev 3592) @@ -6,11 +6,6 @@ http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4"> - <module> - <web> - <web-uri>jaxws-jbws1581.war</web-uri> - <context-root>jaxws-jbws1581</context-root> - </web> - </module> + <module><ejb>jaxws-jbws1556.jar</ejb></module> </application> \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2007-06-15 08:02:07 UTC (rev 3591) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml 2007-06-15 12:42:58 UTC (rev 3592) @@ -5,5 +5,5 @@ "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> <jboss-app> - <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.ear</loader-repository> + <loader-repository>jbossws.jbws1556:domain=jaxws-jbws1556.ear</loader-repository> </jboss-app> \ No newline at end of file

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3591 - branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log.

by jbossws-commits＠lists.jboss.org

Author: palin Date: 2007-06-15 04:02:07 -0400 (Fri, 15 Jun 2007) New Revision: 3591 Modified: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java Log: Minor changes on JDKLogRedirector Modified: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-15 08:01:11 UTC (rev 3590) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-15 08:02:07 UTC (rev 3591) @@ -40,6 +40,7 @@ public class JDKLogRedirector { private List<String> namespaces = new LinkedList<String>(); + private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class); public JDKLogRedirector() { @@ -64,7 +65,7 @@ { if (ns == null) ns = ""; - Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns); + myLogger.debug("Changing current root logger's log handlers to hide records with namespace " + ns); java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); Handler[] handlers = jdkRootLogger.getHandlers(); for (int i = 0; i < handlers.length; i++) @@ -74,7 +75,7 @@ { StringBuffer sb = new StringBuffer("Disableing handler "); sb.append(handler).append(" with level ").append(handler.getLevel()); - Logger.getLogger(this.getClass()).debug(sb); + myLogger.debug(sb); Filter f = handler.getFilter(); if (f != null && f instanceof NamespaceFilter) { @@ -88,6 +89,7 @@ } } } + myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns); Handler jbossLogHandler = new JBossLogHandler(); jbossLogHandler.setLevel(Level.ALL); java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler);

18 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007