JBoss Portal SVN: r8948 - in modules/web/trunk/web: src/main/org/jboss/portal/test/web/container and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-15 11:07:42 -0500 (Thu, 15 Nov 2007)
New Revision: 8948
Modified:
modules/web/trunk/web/build.xml
modules/web/trunk/web/src/main/org/jboss/portal/test/web/container/ServletContainerTestCase.java
modules/web/trunk/web/src/main/org/jboss/portal/web/RequestInfo.java
Log:
update web module to common update
Modified: modules/web/trunk/web/build.xml
===================================================================
--- modules/web/trunk/web/build.xml 2007-11-15 15:54:55 UTC (rev 8947)
+++ modules/web/trunk/web/build.xml 2007-11-15 16:07:42 UTC (rev 8948)
@@ -761,13 +761,4 @@
</target>
- <target name="reports" depends="init">
- <junitreport todir="output/tests">
- <fileset dir="output/tests">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="output/tests"/>
- </junitreport>
- </target>
-
</project>
Modified: modules/web/trunk/web/src/main/org/jboss/portal/test/web/container/ServletContainerTestCase.java
===================================================================
--- modules/web/trunk/web/src/main/org/jboss/portal/test/web/container/ServletContainerTestCase.java 2007-11-15 15:54:55 UTC (rev 8947)
+++ modules/web/trunk/web/src/main/org/jboss/portal/test/web/container/ServletContainerTestCase.java 2007-11-15 16:07:42 UTC (rev 8948)
@@ -27,6 +27,7 @@
import org.jboss.portal.web.WebAppEvent;
import org.jboss.portal.web.spi.ServletContainerContext;
import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.common.util.Tools;
import org.jboss.portal.test.web.WebAppRegistry;
import org.jboss.unit.api.pojo.annotations.Test;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
@@ -134,11 +135,11 @@
//
scc.registration.registerWebApp(new WebAppContextImpl("/foo"));
scc.registration.registerWebApp(new WebAppContextImpl("/bar"));
- assertEquals(new CollectionBuilder().add("/foo").add("/bar").toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{"/foo", "/bar"}), registry.getKeys());
//
scc.registration.cancel();
- assertEquals(new CollectionBuilder().toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{}), registry.getKeys());
}
@Test
@@ -155,19 +156,19 @@
//
container.register(scc);
scc.registration.registerWebApp(new WebAppContextImpl("/foo"));
- assertEquals(new CollectionBuilder().add("/foo").toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{"/foo"}), registry.getKeys());
//
container.addWebAppListener(registry);
- assertEquals(new CollectionBuilder().add("/foo").toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{"/foo"}), registry.getKeys());
//
container.removeWebAppListener(registry);
- assertEquals(new CollectionBuilder().toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{}), registry.getKeys());
//
container.removeWebAppListener(registry);
- assertEquals(new CollectionBuilder().toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{}), registry.getKeys());
}
@Test
@@ -188,31 +189,31 @@
container.addWebAppListener(registry);
// Assert we received events during the registration
- assertEquals(new CollectionBuilder().add("/foo").add("/bar").toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{"/foo", "/bar"}), registry.getKeys());
// Add a new web app
scc.registration.registerWebApp(new WebAppContextImpl("/juu"));
// Assert we now have 3 web apps
- assertEquals(new CollectionBuilder().add("/foo").add("/bar").add("/juu").toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{"/foo", "/bar", "/juu"}), registry.getKeys());
// Remove one web app
scc.registration.unregisterWebApp("/foo");
// Assert we have 2 web apps
- assertEquals(new CollectionBuilder().add("/bar").add("/juu").toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{"/bar", "/juu"}), registry.getKeys());
// Remove registration
container.removeWebAppListener(registry);
// Assert we receveived events during removal
- assertEquals(new CollectionBuilder().toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{}), registry.getKeys());
// W Add a new web app
scc.registration.registerWebApp(new WebAppContextImpl("/foo"));
// hen unregistered, a new web app registration does not send event
- assertEquals(new CollectionBuilder().toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{}), registry.getKeys());
}
@Test
@@ -282,6 +283,6 @@
//
scc.registration.registerWebApp(new WebAppContextImpl("/foo"));
assertTrue(called.get());
- assertEquals(new CollectionBuilder().add("/foo").toHashSet(), registry.getKeys());
+ assertEquals(Tools.toSet(new String[]{"/foo"}), registry.getKeys());
}
}
Modified: modules/web/trunk/web/src/main/org/jboss/portal/web/RequestInfo.java
===================================================================
--- modules/web/trunk/web/src/main/org/jboss/portal/web/RequestInfo.java 2007-11-15 15:54:55 UTC (rev 8947)
+++ modules/web/trunk/web/src/main/org/jboss/portal/web/RequestInfo.java 2007-11-15 16:07:42 UTC (rev 8948)
@@ -165,7 +165,7 @@
//
this.method = method;
this.queryParameterMap = new ParameterMap(queryParameterMap);
- this.bodyParameterMap = new ParameterMap(bodyParameterMap);
+ this.bodyParameterMap = bodyParameterMap != null ? new ParameterMap(bodyParameterMap) : null;
this.mediaType = mediaType;
}
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8947 - in modules/common/trunk/common/src: main/java/org/jboss/portal/common/value and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-15 10:54:55 -0500 (Thu, 15 Nov 2007)
New Revision: 8947
Added:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/SimpleMapAccessor.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/TypedMapTestCase.java
Removed:
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/TypedMapTestCase.java
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MapAccessor.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterMap.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java
modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ParameterMapTestCase.java
Log:
generified TypedMap + improved it
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MapAccessor.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MapAccessor.java 2007-11-15 14:49:38 UTC (rev 8946)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/MapAccessor.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -30,14 +30,14 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 7228 $
*/
-public interface MapAccessor
+public interface MapAccessor<K, V>
{
/**
* Return the accessed map.
*
- * @param requestWriteable whether or not the Map will be accessed for a write-type (e.g., put, remove...) operation.
+ * @param writable whether or not the Map will be accessed for a write-type (e.g., put, remove...) operation.
* This allows for lazy initialization via a create-on-write mechanism.
* @return a non null map
*/
- Map getMap(boolean requestWriteable);
+ Map<K, V> getMap(boolean writable);
}
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterMap.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterMap.java 2007-11-15 14:49:38 UTC (rev 8946)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterMap.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -32,44 +32,67 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 6671 $
*/
-public class ParameterMap extends TypedMap
+public class ParameterMap extends TypedMap<String, String[], String, String[]>
{
- /** If true returned values will be cloned when returned to the client. */
- private boolean cloneInternalValue;
+ /** . */
+ private static final KeyConverter keyConv = new KeyConverter();
- /** If true returned values will be cloned when provided by the client. */
- private boolean cloneExternalValue;
+ /** . */
+ private static final ValueConverter valueConv1 = new ValueConverter(false, false);
- public ParameterMap(boolean cloneInternalValue, boolean cloneExternalValue)
+ /** . */
+ private static final ValueConverter valueConv2 = new ValueConverter(false, true);
+
+ /** . */
+ private static final ValueConverter valueConv3 = new ValueConverter(true, false);
+
+ /** . */
+ private static final ValueConverter valueConv4 = new ValueConverter(true, true);
+
+ private static ValueConverter getValueConverter(boolean cloneInternalValue, boolean cloneExternalValue)
{
- this(new HashMap(), cloneInternalValue, cloneExternalValue);
+ if (cloneInternalValue)
+ {
+ if (cloneExternalValue)
+ {
+ return valueConv4;
+ }
+ else
+ {
+ return valueConv3;
+ }
+ }
+ else
+ {
+ if (cloneExternalValue)
+ {
+ return valueConv2;
+ }
+ else
+ {
+ return valueConv1;
+ }
+ }
}
- public ParameterMap(MapAccessor accessor, boolean cloneInternalValue, boolean cloneExternalValue)
- {
- super(accessor);
+ /** . */
+ private final boolean cloneInternalValue;
- //
- this.cloneInternalValue = cloneInternalValue;
- this.cloneExternalValue = cloneExternalValue;
- }
+ /** . */
+ private final boolean cloneExternalValue;
- public ParameterMap(Map delegate, boolean cloneInternalValue, boolean cloneExternalValue)
+ public ParameterMap(boolean cloneInternalValue, boolean cloneExternalValue)
{
- super(delegate);
-
- //
- this.cloneInternalValue = cloneInternalValue;
- this.cloneExternalValue = cloneExternalValue;
+ this(new HashMap<String, String[]>(), cloneInternalValue, cloneExternalValue);
}
- public ParameterMap(MapAccessor accessor)
+ public ParameterMap(MapAccessor<String, String[]> accessor)
{
this(accessor, false, false);
}
- public ParameterMap(Map delegate)
+ public ParameterMap(Map<String, String[]> delegate)
{
this(delegate, false, false);
}
@@ -79,6 +102,24 @@
this(false, false);
}
+ public ParameterMap(MapAccessor<String, String[]> accessor, boolean cloneInternalValue, boolean cloneExternalValue)
+ {
+ super(accessor, keyConv, getValueConverter(cloneInternalValue, cloneExternalValue));
+
+ //
+ this.cloneInternalValue = cloneInternalValue;
+ this.cloneExternalValue = cloneExternalValue;
+ }
+
+ public ParameterMap(Map<String, String[]> delegate, boolean cloneInternalValue, boolean cloneExternalValue)
+ {
+ super(delegate, keyConv, getValueConverter(cloneInternalValue, cloneExternalValue));
+
+ //
+ this.cloneInternalValue = cloneInternalValue;
+ this.cloneExternalValue = cloneExternalValue;
+ }
+
/**
* Return true if values returned by the map are cloned.
*
@@ -89,79 +130,94 @@
return cloneInternalValue;
}
- /**
- * Only accept non null string objects.
- *
- * @throws ClassCastException if the value is not an instance of string
- */
- protected void assertKeyValidity(Object value) throws ClassCastException
+ public boolean isCloneExternalValue()
{
- if (value instanceof String == false)
- {
- throw new ClassCastException("Key should be a String");
- }
+ return cloneExternalValue;
}
- /**
- * Only check are made to the value. The only valid values accepted
- * are string arrays with non zero length and containing non null
- * values.
- *
- * @throws NullPointerException if the value is null
- * @throws ClassCastException if the value type is not an array of string
- * @throws IllegalArgumentException if the array length is zero or one of the array value is null
- */
- protected Object getInternalValue(Object value) throws NullPointerException, ClassCastException, IllegalArgumentException
+ private static class KeyConverter extends Converter<String, String>
{
- if (value instanceof String[] == false)
+ protected String getInternal(String external) throws IllegalArgumentException, ClassCastException
{
- throw new ClassCastException("Value should be a String[]");
+ return external;
}
- String[] strings = (String[])value;
- if (strings.length == 0)
+ protected String getExternal(String internal)
{
- throw new IllegalArgumentException("Array must not be zero length");
+ return internal;
}
-
- //
- for (int i = strings.length - 1;i >= 0;i--)
+ protected boolean equals(String left, String right)
{
- if (strings[i] == null)
- {
- throw new IllegalArgumentException("No null entries allowed in String[]");
- }
+ return left.equals(right);
}
+ }
- //
- if (cloneExternalValue)
+ private static class ValueConverter extends Converter<String[], String[]>
+ {
+
+ /** . */
+ private final boolean cloneInternalValue;
+
+ /** . */
+ private final boolean cloneExternalValue;
+
+ private ValueConverter(boolean cloneInternalValue, boolean cloneExternalValue)
{
- strings = (String[])strings.clone();
+ this.cloneInternalValue = cloneInternalValue;
+ this.cloneExternalValue = cloneExternalValue;
}
- //
- return strings;
- }
+ /**
+ * Only check are made to the value. The only valid values accepted
+ * are string arrays with non zero length and containing non null
+ * values.
+ *
+ * @param external
+ * @return
+ * @throws NullPointerException if the value is null
+ * @throws ClassCastException if the value type is not an array of string
+ * @throws IllegalArgumentException if the array length is zero or one of the array value is null
+ */
+ protected String[] getInternal(String[] external) throws IllegalArgumentException, ClassCastException, NullPointerException
+ {
+ if (external.length == 0)
+ {
+ throw new IllegalArgumentException("Array must not be zero length");
+ }
+ //
+ for (int i = external.length - 1;i >= 0;i--)
+ {
+ if (external[i] == null)
+ {
+ throw new IllegalArgumentException("No null entries allowed in String[]");
+ }
+ }
- protected Object getExternalValue(Object value)
- {
- if (cloneInternalValue)
+ //
+ if (cloneExternalValue)
+ {
+ external = external.clone();
+ }
+
+ //
+ return external;
+ }
+
+ protected String[] getExternal(String[] internal)
{
- return ((String[])value).clone();
+ if (cloneInternalValue)
+ {
+ internal = internal.clone();
+ }
+ return internal;
}
- else
+
+ protected boolean equals(String[] left, String[] right)
{
- return value;
+ return Arrays.equals(left, right);
}
}
- protected boolean internalValueEquals(Object left, Object right)
- {
- String[] valuesL = (String[])left;
- String[] valuesR = (String[])right;
- return Arrays.equals(valuesL, valuesR);
- }
-
/**
* Return the parameter value or null if it does not exist.
*
@@ -171,7 +227,7 @@
*/
public String getValue(String name) throws IllegalArgumentException
{
- String[] value = (String[])get(name);
+ String[] value = get(name);
return value == null ? null : value[0];
}
@@ -188,7 +244,7 @@
{
throw new IllegalArgumentException("No null name");
}
- return (String[])get(name);
+ return get(name);
}
/**
Added: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/SimpleMapAccessor.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/SimpleMapAccessor.java (rev 0)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/SimpleMapAccessor.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.portal.common.util;
+
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class SimpleMapAccessor<K, V> implements MapAccessor<K, V>
+{
+
+ /** . */
+ private Map<K, V> delegate;
+
+ public SimpleMapAccessor(Map<K, V> delegate)
+ {
+ if (delegate == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.delegate = delegate;
+ }
+
+ public Map<K, V> getMap(boolean writable)
+ {
+ return delegate;
+ }
+}
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java 2007-11-15 14:49:38 UTC (rev 8946)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/TypedMap.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -24,304 +24,222 @@
import org.jboss.portal.common.NotYetImplemented;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.HashMap;
/**
- * A decorator that enforce the map content to be checked against a type. Null internal values are not supported.
- *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 7304 $
+ * @version $Revision: 1.1 $
*/
-public abstract class TypedMap implements Map
+public class TypedMap<EK, EV, IK, IV> implements Map<EK, EV>
{
- /** The map accessor. */
- protected final MapAccessor accessor;
-
- protected TypedMap(MapAccessor accessor)
+ public abstract static class Converter<E, I>
{
- if (accessor == null)
- {
- throw new IllegalArgumentException("Need a valid accessor");
- }
- this.accessor = accessor;
- }
- protected TypedMap(final Map delegate)
- {
- accessor = new LazyMapAccessor(delegate);
- }
+ /**
+ * Unwraps the key to the the internal key that will be stored in the map. This method calls the
+ * <code>assertKeyValidity(Object key)</code> and returns the same key. It can be overriden to provide a customized
+ * key that will be used instead of the external key.
+ *
+ * @param external the key to unwrap
+ * @return the unwrapped key
+ * @throws ClassCastException if the class of the specified key prevents it from being stored in this map
+ * @throws IllegalArgumentException if some aspect of this key prevents it from being stored in this map
+ */
+ protected abstract I getInternal(E external) throws IllegalArgumentException, ClassCastException;
- /**
- * Return the map provided by the accessor.
- *
- * @param requestWriteable
- * @return the delegate map
- */
- protected final Map getDelegate(boolean requestWriteable)
- {
- return accessor.getMap(requestWriteable);
- }
+ /**
+ * Wrap the internal key into its external representation, by default returns the same key. It can be overriden to
+ * provide a customized key that will be used instead of the internal key.
+ */
+ protected abstract E getExternal(I internal);
- /**
- * Override to check the validity of the key, the default implementation is an empty method.
- *
- * @throws ClassCastException if the class of the specified key prevents it from being stored in this map
- * @throws IllegalArgumentException if some aspect of this key prevents it from being stored in this map
- */
- protected void assertKeyValidity(Object key) throws IllegalArgumentException, ClassCastException
- {
- }
+ public I unwrap(E external) throws IllegalArgumentException, ClassCastException, NullPointerException
+ {
+ if (external == null)
+ {
+ throw new NullPointerException("No null key accepted");
+ }
- /**
- * Unwraps the key to the the internal key that will be stored in the map. This method calls the
- * <code>assertKeyValidity(Object key)</code> and returns the same key. It can be overriden to provide a customized
- * key that will be used instead of the external key.
- *
- * @param key the key to unwrap
- * @return the unwrapped key
- * @throws ClassCastException if the class of the specified key prevents it from being stored in this map
- * @throws IllegalArgumentException if some aspect of this key prevents it from being stored in this map
- */
- protected Object getInternalKey(Object key) throws IllegalArgumentException, ClassCastException
- {
- assertKeyValidity(key);
+ //
+ I internal = getInternal(external);
- //
- return key;
- }
+ //
+ if (internal == null)
+ {
+ throw new IllegalArgumentException("The provided key " + external + " was converted to a null key");
+ }
- /**
- * Wrap the internal key into its external representation, by default returns the same key. It can be overriden to
- * provide a customized key that will be used instead of the internal key.
- */
- protected Object getExternalKey(Object key)
- {
- return key;
- }
-
- protected final Object unwrapKey(Object externalKey) throws IllegalArgumentException, ClassCastException, NullPointerException
- {
- if (externalKey == null)
- {
- throw new NullPointerException("No null key accepted");
+ //
+ return internal;
}
- //
- Object internalKey = getInternalKey(externalKey);
-
- //
- if (internalKey == null)
+ public E wrap(I internal) throws IllegalStateException
{
- throw new IllegalArgumentException("The provided key " + externalKey + " was converted to a null key");
- }
+ if (internal == null)
+ {
+ throw new IllegalStateException("Got an internal null key");
+ }
- //
- return internalKey;
- }
+ //
+ E external = getExternal(internal);
- protected final Object wrapKey(Object internalKey) throws IllegalStateException
- {
- if (internalKey == null)
- {
- throw new IllegalStateException("Got an internal null key");
+ //
+ if (external == null)
+ {
+ throw new IllegalStateException("Converted an internal key to a null key " + internal);
+ }
+
+ //
+ return external;
}
- //
- Object externalKey = getExternalKey(internalKey);
-
- //
- if (externalKey == null)
+ public boolean safeEquals(I left, I right)
{
- throw new IllegalStateException("Converted an internal key to a null key " + internalKey);
+ // Check the internal value, it should not be null
+ return !(left == null || right == null) && equals(left, right);
}
- //
- return externalKey;
+ /**
+ * Compare internal values, the passed argument are never null.
+ *
+ * @param left the left value
+ * @param right the right value
+ * @return true if the values are equals
+ */
+ protected abstract boolean equals(I left, I right);
}
- /**
- * Unwrap the value to the the internal value that will be stored in the map.
- *
- * @param value the value to unwrap
- * @return the unwrapped value
- * @throws ClassCastException if the class of the specified value prevents it from being stored in this map
- * @throws IllegalArgumentException if some aspect of this value prevents it from being stored in this map
- */
- protected Object getInternalValue(Object value) throws IllegalArgumentException, ClassCastException
- {
- return value;
- }
+ /** The map accessor. */
+ private final MapAccessor<IK, IV> accessor;
- /**
- * Wrap the internal value into its external representation. The external representation value should not be null. If
- * it is not possible to obtain an external value representation of the internal value, then the the null value
- * should be returned from this method.
- *
- * @param value the param value which will not be null
- * @return the external value
- */
- protected Object getExternalValue(Object value)
- {
- return value;
- }
+ /** The key converter. */
+ private final Converter<EK, IK> keyConverter;
- /**
- * Extract the internal value from an external value.
- *
- * @param externalValue the external value to unwrap
- * @return the non null internal value
- * @throws IllegalArgumentException
- * @throws ClassCastException
- * @throws NullPointerException
- */
- protected final Object unwrapValue(Object externalValue) throws IllegalArgumentException, ClassCastException, NullPointerException
+ /** The value converter. */
+ private final Converter<EV, IV> valueConverter;
+
+ public TypedMap(MapAccessor<IK, IV> accessor, Converter<EK, IK> keyConverter, Converter<EV, IV> valueConverter)
{
- if (externalValue == null)
+ if (accessor == null)
{
- throw new NullPointerException("No null value accepted");
+ throw new IllegalArgumentException();
}
-
- //
- Object internalValue = getInternalValue(externalValue);
-
- //
- if (internalValue == null)
+ if (keyConverter == null)
{
- throw new IllegalArgumentException("The provided value " + externalValue + " was converted to a null value");
+ throw new IllegalArgumentException();
}
+ if (valueConverter == null)
+ {
+ throw new IllegalArgumentException();
+ }
- //
- return internalValue;
+
+ this.accessor = accessor;
+ this.keyConverter = keyConverter;
+ this.valueConverter = valueConverter;
}
- /**
- * Convert an internal value into an external value.
- *
- * @param internalValue the internal value
- * @return the non null external value
- * @throws IllegalStateException if the internal value was null or some aspect prevented it to be converted to an
- * external representation
- */
- protected final Object wrapValue(Object internalValue) throws IllegalStateException
+ public TypedMap(Map<IK, IV> delegate, Converter<EK, IK> keyConv, Converter<EV, IV> valueConv)
{
- if (internalValue == null)
- {
- throw new IllegalStateException("Received an internal null value");
- }
+ this(new SimpleMapAccessor<IK, IV>(delegate), keyConv, valueConv);
+ }
- //
- Object externalValue = getExternalValue(internalValue);
-
- //
- if (externalValue == null)
- {
- throw new IllegalStateException("Converted an internal value to a null value " + internalValue);
- }
-
- //
- return externalValue;
+ public Converter<EK, IK> getKeyConverter()
+ {
+ return keyConverter;
}
- /**
- * Compare internal values, the default implementation delegates the operation to the equals method of the left
- * argument.
- *
- * @param left
- * @param right
- * @return true if the values are equals
- */
- protected boolean internalValueEquals(Object left, Object right)
+ public Converter<EV, IV> getValueConverter()
{
- return left.equals(right);
+ return valueConverter;
}
- public int size()
+ public final int size()
{
- return getDelegate(false).size();
+ return accessor.getMap(false).size();
}
- public void clear()
+ public final void clear()
{
if (!isEmpty())
{
- getDelegate(true).clear();
+ accessor.getMap(true).clear();
}
}
- public boolean isEmpty()
+ public final boolean isEmpty()
{
- return getDelegate(false).isEmpty();
+ return accessor.getMap(false).isEmpty();
}
- public boolean containsKey(Object key)
+ public final boolean containsKey(Object key)
{
- key = unwrapKey(key);
- return getDelegate(false).containsKey(key);
+ EK ek = (EK)key;
+ IK ik = keyConverter.unwrap(ek);
+ return accessor.getMap(false).containsKey(ik);
}
- public boolean containsValue(Object value)
+ public final Set<EK> keySet()
{
- value = unwrapValue(value);
- return getDelegate(false).containsValue(value);
+ return new KeySet();
}
- public Collection values()
+ public EV put(EK ek, EV ev)
{
- return new ValueCollection();
+ IK ik = keyConverter.unwrap(ek);
+ IV iv = valueConverter.unwrap(ev);
+ iv = accessor.getMap(true).put(ik, iv);
+ return iv == null ? null : valueConverter.wrap(iv);
}
- public void putAll(Map t)
+ public final EV get(Object key)
{
- t = convert(t);
- getDelegate(true).putAll(t);
+ EK ek = (EK)key;
+ IK ik = keyConverter.unwrap(ek);
+ IV iv = accessor.getMap(false).get(ik);
+ return iv == null ? null : valueConverter.wrap(iv);
}
- public Set entrySet()
+ public final EV remove(Object key)
{
- return new TypedMap.TypedEntrySet();
+ EK ek = (EK)key;
+ IK ik = keyConverter.unwrap(ek);
+ IV iv = null;
+ if (!isEmpty())
+ {
+ iv = accessor.getMap(true).remove(ik);
+ }
+ return iv == null ? null : valueConverter.wrap(iv);
}
- public Set keySet()
+ public final boolean containsValue(Object value)
{
- return new KeySet();
+ EV ev = (EV)value;
+ IV iv = valueConverter.unwrap(ev);
+ return accessor.getMap(false).containsValue(iv);
}
- public Object get(Object key)
+ public final Set<Entry<EK, EV>> entrySet()
{
- key = unwrapKey(key);
- Object value = getDelegate(false).get(key);
- return value == null ? null : wrapValue(value);
+ return new TypedEntrySet();
}
- public Object remove(Object key)
+ public void putAll(Map<? extends EK, ? extends EV> em)
{
- key = unwrapKey(key);
-
- Object value = null;
- if (!isEmpty())
- {
- value = getDelegate(true).remove(key);
- }
-
- return value == null ? null : wrapValue(value);
+ Map<IK, IV> im = convert(em);
+ accessor.getMap(true).putAll(im);
}
- public Object put(Object key, Object value)
+ public Collection<EV> values()
{
- key = unwrapKey(key);
- value = unwrapValue(value);
- value = getDelegate(true).put(key, value);
- return value == null ? null : wrapValue(value);
+ return new ValueCollection();
}
- // Overriden methods
-
/** Compare to parameters objects. */
public boolean equals(Object o)
{
@@ -331,8 +249,8 @@
}
if (o instanceof Map)
{
- Map that = (Map)o;
- Map delegate = getDelegate(false);
+ Map<EK, EV> that = (Map<EK,EV>)o;
+ Map<IK, IV> delegate = this.accessor.getMap(false);
// Must have same sizes
if (that.size() != delegate.size())
@@ -341,32 +259,26 @@
}
//
- for (Iterator i = that.entrySet().iterator(); i.hasNext();)
+ for (Entry<EK, EV> thatEntry : that.entrySet())
{
- Map.Entry thatEntry = (Map.Entry)i.next();
- Object thatKey = thatEntry.getKey();
- Object thatValue = thatEntry.getValue();
+ EK thatKey = thatEntry.getKey();
+ EV thatValue = thatEntry.getValue();
+
//
try
{
- // Unwrap key
- thatKey = unwrapKey(thatKey);
+ // Unwrap key, mostly for checking its type is correct
+ keyConverter.unwrap(thatKey);
// Unwrap value
- thatValue = unwrapValue(thatValue);
+ IV iv = valueConverter.unwrap(thatValue);
// Get the internal value
- Object internalValue = delegate.get(thatKey);
+ IV internalValue = delegate.get(thatKey);
- // Check the internal value, it should not be null
- if (internalValue == null)
- {
- return false;
- }
-
// Perform value comparison
- if (internalValueEquals(internalValue, thatValue) == false)
+ if (!valueConverter.safeEquals(internalValue, iv))
{
return false;
}
@@ -395,29 +307,52 @@
public String toString()
{
- return getDelegate(false).toString();
+ return accessor.getMap(false).toString();
}
- // API extension
+ /**
+ * Validates and unwraps the map.
+ *
+ * @param t
+ * @return
+ * @throws IllegalArgumentException
+ * @throws NullPointerException
+ * @throws ClassCastException
+ */
+ protected final Map<IK, IV> convert(Map<? extends EK, ? extends EV> t) throws IllegalArgumentException, NullPointerException, ClassCastException
+ {
+ if (t == null)
+ {
+ throw new NullPointerException("No null map can be accepted");
+ }
+ Map<IK, IV> u = new HashMap<IK, IV>(t.size());
+ for (Entry<? extends EK, ? extends EV> entry : t.entrySet())
+ {
+ IK ik = keyConverter.unwrap(entry.getKey());
+ IV iv = valueConverter.unwrap(entry.getValue());
+ u.put(ik, iv);
+ }
+ return u;
+ }
/**
* Replace the content with the new map which is validated before replacement.
*
- * @param t the replacement map
+ * @param map the replacement map
* @throws ClassCastException
* @throws NullPointerException
* @throws IllegalArgumentException
*/
- public void replace(Map t) throws ClassCastException, NullPointerException, IllegalArgumentException
+ public void replace(Map<EK, EV> map) throws ClassCastException, NullPointerException, IllegalArgumentException
{
- if (!t.isEmpty())
+ if (!map.isEmpty())
{
- t = convert(t);
+ Map<IK, IV> tmp = convert(map);
//
- Map delegate = getDelegate(true);
+ Map<IK, IV> delegate = accessor.getMap(true);
delegate.clear();
- delegate.putAll(t);
+ delegate.putAll(tmp);
}
}
@@ -430,41 +365,22 @@
*/
public void validate() throws ClassCastException, NullPointerException, IllegalArgumentException
{
- for (Iterator i = getDelegate(false).entrySet().iterator(); i.hasNext();)
+ for (Entry<IK, IV> entry : accessor.getMap(false).entrySet())
{
- Entry entry = (Entry)i.next();
- wrapKey(entry.getKey());
- wrapValue(entry.getValue());
+ keyConverter.wrap(entry.getKey());
+ valueConverter.wrap(entry.getValue());
}
}
- /** Validate the map and unwrap it if necessary. */
- protected final Map convert(Map t) throws IllegalArgumentException, NullPointerException, ClassCastException
+ public class KeySet implements Set<EK>
{
- if (t == null)
- {
- throw new NullPointerException("No null map can be accepted");
- }
- Map u = new HashMap(t.size());
- for (Iterator i = t.entrySet().iterator(); i.hasNext();)
- {
- Entry entry = (Entry)i.next();
- Object key = unwrapKey(entry.getKey());
- Object value = unwrapValue(entry.getValue());
- u.put(key, value);
- }
- return u;
- }
- public class ValueCollection implements Collection
- {
-
/** . */
- private final Collection delegate;
+ private final Set<IK> delegate;
- public ValueCollection()
+ public KeySet()
{
- this.delegate = getDelegate(false).values();
+ this.delegate = TypedMap.this.accessor.getMap(false).keySet();
}
public int size()
@@ -474,7 +390,10 @@
public void clear()
{
- delegate.clear();
+ if (!isEmpty())
+ {
+ delegate.clear();
+ }
}
public boolean isEmpty()
@@ -482,65 +401,106 @@
return delegate.isEmpty();
}
+ public boolean contains(Object o)
+ {
+ EK ek;
+ try
+ {
+ ek = (EK)o;
+ }
+ catch (ClassCastException e)
+ {
+ return false;
+ }
+ try
+ {
+ IK ik = keyConverter.getInternal(ek);
+ return TypedMap.this.accessor.getMap(false).containsKey(ik);
+ }
+ catch (IllegalArgumentException e)
+ {
+ return false;
+ }
+ catch (ClassCastException e)
+ {
+ return false;
+ }
+ catch (NullPointerException e)
+ {
+ return false;
+ }
+ }
+
public Object[] toArray()
{
throw new NotYetImplemented("TypedEntrySet.toArray()");
}
- public boolean add(Object o)
+ public boolean add(EK ek)
{
throw new NotYetImplemented("TypedEntrySet.add(Object o)");
}
- public boolean contains(Object o)
- {
- throw new NotYetImplemented("TypedEntrySet.contains(Object o)");
- }
-
public boolean remove(Object o)
{
throw new NotYetImplemented("TypedEntrySet.remove(Object o)");
}
- public boolean addAll(Collection c)
+ public boolean containsAll(Collection<?> objects)
{
throw new NotYetImplemented("TypedEntrySet.addAll(Collection c)");
}
- public boolean containsAll(Collection c)
+ public boolean addAll(Collection<? extends EK> eks)
{
throw new NotYetImplemented("TypedEntrySet.containsAll(Collection c)");
}
- public boolean removeAll(Collection c)
+ public boolean removeAll(Collection<?> objects)
{
throw new NotYetImplemented("TypedEntrySet.removeAll(Collection c)");
}
- public boolean retainAll(Collection c)
+ public boolean retainAll(Collection<?> c)
{
- throw new NotYetImplemented("TypedEntrySet.retainAll(Collection c)");
+ if (c == null)
+ {
+ throw new NullPointerException();
+ }
+
+ //
+ boolean changed = false;
+ for (Iterator i = iterator(); i.hasNext();)
+ {
+ Object key = i.next();
+ if (!c.contains(key))
+ {
+ i.remove();
+ changed = true;
+ }
+ }
+ return changed;
}
- public Iterator iterator()
+ public Iterator<EK> iterator()
{
- return new ValueIterator();
+ return new KeyIterator();
}
- public Object[] toArray(Object a[])
+ public <EK> EK[] toArray(EK a[])
{
throw new NotYetImplemented("TypedEntrySet.toArray(Object a[])");
}
- public class ValueIterator implements Iterator
+ public class KeyIterator implements Iterator<EK>
{
/** . */
- private final Iterator delegate;
+ private final Iterator<IK> delegate;
- public ValueIterator()
+ public KeyIterator()
{
- this.delegate = ValueCollection.this.delegate.iterator();
+ this.delegate = KeySet.this.delegate.iterator();
}
public void remove()
@@ -553,24 +513,23 @@
return delegate.hasNext();
}
- public Object next()
+ public EK next()
{
- Object value = delegate.next();
- value = wrapValue(value);
- return value;
+ IK ik = delegate.next();
+ return keyConverter.wrap(ik);
}
}
}
- public class KeySet implements Set
+ public class ValueCollection implements Collection<EV>
{
/** . */
- private final Set delegate;
+ private final Collection<IV> delegate;
- public KeySet()
+ public ValueCollection()
{
- this.delegate = getDelegate(false).keySet();
+ this.delegate = TypedMap.this.accessor.getMap(false).values();
}
public int size()
@@ -580,10 +539,7 @@
public void clear()
{
- if (!isEmpty())
- {
- delegate.clear();
- }
+ delegate.clear();
}
public boolean isEmpty()
@@ -591,97 +547,65 @@
return delegate.isEmpty();
}
- public boolean contains(Object o)
- {
- try
- {
- Object key = unwrapKey(o);
- return getDelegate(false).containsKey(key);
- }
- catch (IllegalArgumentException e)
- {
- return false;
- }
- catch (ClassCastException e)
- {
- return false;
- }
- catch (NullPointerException e)
- {
- return false;
- }
- }
-
public Object[] toArray()
{
throw new NotYetImplemented("TypedEntrySet.toArray()");
}
- public boolean add(Object o)
+ public boolean add(EV ev)
{
throw new NotYetImplemented("TypedEntrySet.add(Object o)");
}
+ public boolean contains(Object o)
+ {
+ throw new NotYetImplemented("TypedEntrySet.contains(Object o)");
+ }
+
public boolean remove(Object o)
{
throw new NotYetImplemented("TypedEntrySet.remove(Object o)");
}
- public boolean addAll(Collection c)
+ public boolean addAll(Collection<? extends EV> evs)
{
throw new NotYetImplemented("TypedEntrySet.addAll(Collection c)");
}
- public boolean containsAll(Collection c)
+ public boolean containsAll(Collection<?> objects)
{
throw new NotYetImplemented("TypedEntrySet.containsAll(Collection c)");
}
- public boolean removeAll(Collection c)
+ public boolean removeAll(Collection<?> objects)
{
throw new NotYetImplemented("TypedEntrySet.removeAll(Collection c)");
}
- public boolean retainAll(Collection c)
+ public boolean retainAll(Collection<?> objects)
{
- if (c == null)
- {
- throw new NullPointerException();
- }
-
- //
- boolean changed = false;
- for (Iterator i = iterator(); i.hasNext();)
- {
- Object key = i.next();
- if (!c.contains(key))
- {
- i.remove();
- changed = true;
- }
- }
- return changed;
+ throw new NotYetImplemented("TypedEntrySet.retainAll(Collection c)");
}
- public Iterator iterator()
+ public <T> T[] toArray(T[] ts)
{
- return new KeyIterator();
+ throw new NotYetImplemented("TypedEntrySet.toArray(Object a[])");
}
- public Object[] toArray(Object a[])
+ public Iterator<EV> iterator()
{
- throw new NotYetImplemented("TypedEntrySet.toArray(Object a[])");
+ return new ValueIterator();
}
- public class KeyIterator implements Iterator
+ public class ValueIterator implements Iterator<EV>
{
/** . */
- private final Iterator delegate;
+ private final Iterator<IV> delegate;
- public KeyIterator()
+ public ValueIterator()
{
- this.delegate = KeySet.this.delegate.iterator();
+ this.delegate = ValueCollection.this.delegate.iterator();
}
public void remove()
@@ -694,24 +618,23 @@
return delegate.hasNext();
}
- public Object next()
+ public EV next()
{
- Object key = delegate.next();
- key = wrapKey(key);
- return key;
+ IV iv = delegate.next();
+ return valueConverter.wrap(iv);
}
}
}
- public class TypedEntrySet implements Set
+ public class TypedEntrySet implements Set<Entry<EK, EV>>
{
/** . */
- private final Set delegate;
+ private final Set<Entry<IK, IV>> delegate;
public TypedEntrySet()
{
- this.delegate = getDelegate(false).entrySet();
+ this.delegate = TypedMap.this.accessor.getMap(false).entrySet();
}
public int size()
@@ -737,7 +660,7 @@
throw new NotYetImplemented("TypedEntrySet.toArray()");
}
- public boolean add(Object o)
+ public boolean add(Entry<EK, EV> ekevEntry)
{
throw new NotYetImplemented("TypedEntrySet.add(Object o)");
}
@@ -752,41 +675,41 @@
throw new NotYetImplemented("TypedEntrySet.remove(Object o)");
}
- public boolean addAll(Collection c)
+ public boolean addAll(Collection<? extends Entry<EK, EV>> entries)
{
throw new NotYetImplemented("TypedEntrySet.addAll(Collection c)");
}
- public boolean containsAll(Collection c)
+ public boolean containsAll(Collection<?> objects)
{
throw new NotYetImplemented("TypedEntrySet.containsAll(Collection c)");
}
- public boolean removeAll(Collection c)
+ public boolean removeAll(Collection<?> objects)
{
throw new NotYetImplemented("TypedEntrySet.removeAll(Collection c)");
}
- public boolean retainAll(Collection c)
+ public boolean retainAll(Collection<?> objects)
{
throw new NotYetImplemented("TypedEntrySet.retainAll(Collection c)");
}
- public Iterator iterator()
+ public <T> T[] toArray(T[] ts)
{
- return new TypedEntryIterator();
+ throw new NotYetImplemented("TypedEntrySet.toArray(Object a[])");
}
- public Object[] toArray(Object a[])
+ public Iterator<Entry<EK, EV>> iterator()
{
- throw new NotYetImplemented("TypedEntrySet.toArray(Object a[])");
+ return new TypedEntryIterator();
}
- public class TypedEntryIterator implements Iterator
+ public class TypedEntryIterator implements Iterator<Entry<EK, EV>>
{
/** . */
- private final Iterator delegate;
+ private final Iterator<Entry<IK, IV>> delegate;
public TypedEntryIterator()
{
@@ -803,20 +726,20 @@
return delegate.hasNext();
}
- public Object next()
+ public Entry<EK, EV> next()
{
- Entry entry = (Entry)delegate.next();
+ Entry<IK, IV> entry = delegate.next();
return new TypedEntry(entry);
}
}
- public class TypedEntry implements Entry
+ public class TypedEntry implements Entry<EK, EV>
{
/** . */
- private final Entry delegate;
+ private final Entry<IK, IV> delegate;
- public TypedEntry(Entry delegate)
+ public TypedEntry(Entry<IK, IV> delegate)
{
this.delegate = delegate;
}
@@ -836,58 +759,25 @@
return delegate.toString();
}
- public Object getKey()
+ public EK getKey()
{
- Object key = delegate.getKey();
- key = wrapKey(key);
- return key;
+ IK ik = delegate.getKey();
+ return keyConverter.wrap(ik);
}
- public Object getValue()
+ public EV getValue()
{
- Object value = delegate.getValue();
- value = wrapValue(value);
- return value;
+ IV iv = delegate.getValue();
+ return valueConverter.wrap(iv);
}
- public Object setValue(Object value)
+ public EV setValue(Object value)
{
- value = unwrapValue(value);
- return delegate.setValue(value);
+ EV ev = (EV)value;
+ IV iv = valueConverter.unwrap(ev);
+ iv = delegate.setValue(iv);
+ return valueConverter.wrap(iv);
}
}
}
-
- private static class LazyMapAccessor implements MapAccessor
- {
- private Map delegate;
-
- public LazyMapAccessor(Map delegate)
- {
- this.delegate = delegate;
- }
-
- public Map getMap(boolean requestWriteable)
- {
- // if the delegate is null, wait until we need to write to it to initialize it
- if (delegate == null)
- {
- if (requestWriteable)
- {
- delegate = new HashMap();
- }
- else
- {
- return Collections.EMPTY_MAP;
- }
- }
-
- return delegate;
- }
-
- public String toString()
- {
- return getMap(false).toString();
- }
- }
}
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java 2007-11-15 14:49:38 UTC (rev 8946)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/value/Value.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -25,9 +25,6 @@
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.ListIterator;
import java.util.AbstractList;
import java.util.RandomAccess;
@@ -158,11 +155,11 @@
*
* @return a clone of this object
*/
- public final Object clone()
+ public final Value clone()
{
try
{
- return super.clone();
+ return (Value)super.clone();
}
catch (CloneNotSupportedException e)
{
Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ParameterMapTestCase.java
===================================================================
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ParameterMapTestCase.java 2007-11-15 14:49:38 UTC (rev 8946)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ParameterMapTestCase.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -64,7 +64,7 @@
ParameterMap pm = new ParameterMap(new HashMap());
try
{
- pm.put(new Object(), new String[]{"bar"});
+ ((Map)pm).put(new Object(), new String[]{"bar"});
fail();
}
catch (ClassCastException expected)
@@ -72,7 +72,7 @@
}
try
{
- pm.put("foo", new Object[]{});
+ ((Map)pm).put("foo", new Object[]{});
fail();
}
catch (ClassCastException expected)
Deleted: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/TypedMapTestCase.java
===================================================================
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/TypedMapTestCase.java 2007-11-15 14:49:38 UTC (rev 8946)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/TypedMapTestCase.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -1,454 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.portal.test.common;
-
-import junit.framework.TestCase;
-import org.jboss.portal.common.util.CollectionBuilder;
-import org.jboss.portal.common.util.TypedMap;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class TypedMapTestCase extends TestCase
-{
-
- public TypedMapTestCase(String name)
- {
- super(name);
- }
-
- public void testGetWithBrokenGetInternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.internalValueReturnsNull = true;
- map.get("abc");
- map.delegate.put("abc", new Integer(0));
- map.get("abc");
- }
-
- public void testPutWithBrokenGetInternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.internalValueReturnsNull = true;
- try
- {
- map.put("abc", "0");
- fail();
- }
- catch (IllegalArgumentException e)
- {
- }
- }
-
- public void testRemoveWithBrokenGetInternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.internalValueReturnsNull = true;
- map.remove("abc");
- }
-
- public void testRemoveWithBrokenGetExternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.externalValueReturnsNull = true;
- map.remove("abc");
- map.delegate.put("abc", new Integer(0));
- try
- {
- map.remove("abc");
- fail();
- }
- catch (IllegalStateException e)
- {
- }
- }
-
- public void testGetWithBrokenGetExternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.externalValueReturnsNull = true;
- map.get("abc");
- map.delegate.put("abc", new Integer(0));
- try
- {
- map.get("abc");
- fail();
- }
- catch (IllegalStateException e)
- {
- }
- }
-
- public void testPutWithBrokenGetExternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.externalValueReturnsNull = true;
- map.put("abc", "0");
- try
- {
- map.put("abc", "0");
- fail();
- }
- catch (IllegalStateException e)
- {
- }
- }
-
- public void testGetWithInvalidInternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.delegate.put("abc", "0");
- try
- {
- map.get("abc");
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testPutWithInvalidInternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.delegate.put("abc", "0");
- try
- {
- map.put("abc", "0");
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testRemoveWithInvalidInternalValue()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.delegate.put("abc", "0");
- try
- {
- map.remove("abc");
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testRemove()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- assertNull(map.remove("abc"));
- map.delegate.put("abc", new Integer(0));
- assertEquals("0", map.remove("abc"));
- assertTrue(map.delegate.isEmpty());
- }
-
- public void testPut()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- map.put("abc", "0");
- assertEquals(Collections.singletonMap("abc", new Integer(0)), map.delegate);
- }
-
- public void testGet()
- {
- StringToIntegerMap map = new StringToIntegerMap();
- assertNull(map.get("abc"));
- map.delegate.put("abc", new Integer(0));
- assertEquals(Collections.singletonMap("abc", "0"), map);
- }
-
- public void testContainsKeyWithInvalidKey()
- {
- try
- {
- new StringToIntegerMap().containsKey(null);
- fail();
- }
- catch (NullPointerException expected)
- {
- }
- try
- {
- new StringToIntegerMap().containsKey(new Object());
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testContainsValueWithInvalidValue()
- {
- try
- {
- new StringToIntegerMap().containsValue(null);
- fail();
- }
- catch (NullPointerException expected)
- {
- }
- try
- {
- new StringToIntegerMap().containsValue(new Object());
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testRemoveWithInvalidKey()
- {
- try
- {
- new StringToIntegerMap().remove(null);
- fail();
- }
- catch (NullPointerException expected)
- {
- }
- try
- {
- new StringToIntegerMap().remove(new Object());
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testGetWithInvalidKey()
- {
- try
- {
- new StringToIntegerMap().get(null);
- fail();
- }
- catch (NullPointerException expected)
- {
- }
- try
- {
- new StringToIntegerMap().get(new Object());
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testPutWithInvalidKey()
- {
- try
- {
- new StringToIntegerMap().put(null, "0");
- fail();
- }
- catch (NullPointerException expected)
- {
- }
- try
- {
- new StringToIntegerMap().put(new Object(), "0");
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testWithPutInvalidValue()
- {
- try
- {
- new StringToIntegerMap().put("", null);
- fail();
- }
- catch (NullPointerException expected)
- {
- }
- try
- {
- new StringToIntegerMap().put("", new Object());
- fail();
- }
- catch (ClassCastException expected)
- {
- }
- }
-
- public void testEquals()
- {
- StringToIntegerMap left = new StringToIntegerMap();
- left.delegate.put("abc", new Integer(0));
- Map right = new HashMap();
-
- //
- assertFalse(left.equals(right));
- assertFalse(right.equals(left));
-
- //
- right.put("abc", new Object());
- assertFalse(left.equals(right));
- assertFalse(right.equals(left));
-
- //
- right.put("abc", "abc");
- assertFalse(left.equals(right));
- assertFalse(right.equals(left));
-
- //
- right.put("abc", "0");
- assertTrue(left.equals(right));
- assertTrue(right.equals(left));
-
- //
- right.put("def", "1");
- assertFalse(left.equals(right));
- assertFalse(right.equals(left));
-
- //
- right.remove("def");
- right.put(null, "0");
- assertFalse(left.equals(right));
- assertFalse(right.equals(left));
-
- //
- right.remove(null);
- right.put("def", null);
- assertFalse(left.equals(right));
- assertFalse(right.equals(left));
- }
-
- public void testEntrySetRetainAll()
- {
- Map right = new HashMap();
- right.put("abc", new Integer(0));
- right.put("def", new Integer(1));
- right.put("ghi", new Integer(2));
-
- //
- StringToIntegerMap left = new StringToIntegerMap();
- left.delegate.putAll(right);
-
- try
- {
- left.keySet().retainAll(null);
- fail("Was expecting NPE");
- }
- catch (NullPointerException expected)
- {
- }
-
- //
- boolean changed = left.keySet().retainAll(CollectionBuilder.hashSet().add("abc").add("def").add("ghi").get());
- assertFalse(changed);
- assertEquals(right, left.delegate);
-
- //
- changed = left.keySet().retainAll(CollectionBuilder.hashSet().add("def").get());
- assertTrue(changed);
- right.remove("abc");
- right.remove("ghi");
- assertEquals(right, left.delegate);
- }
-
- public static class StringToIntegerMap extends TypedMap
- {
-
- /** . */
- final Map delegate;
-
- /** . */
- boolean internalValueReturnsNull = false;
-
- /** . */
- boolean externalValueReturnsNull = false;
-
- public StringToIntegerMap()
- {
- super(new HashMap());
-
- //
- delegate = getDelegate(false);
- }
-
- protected void assertKeyValidity(Object key) throws ClassCastException
- {
- assertNotNull(key);
- if (key instanceof String == false)
- {
- throw new ClassCastException();
- }
- }
-
- protected Object getInternalValue(Object value) throws IllegalArgumentException, ClassCastException
- {
- assertNotNull(value);
- if (internalValueReturnsNull)
- {
- return null;
- }
- String s = (String)value;
- try
- {
- return new Integer(s);
- }
- catch (NumberFormatException e)
- {
- IllegalArgumentException iae = new IllegalArgumentException();
- iae.initCause(e);
- throw iae;
- }
- }
-
- protected Object getExternalValue(Object value)
- {
- assertNotNull(value);
- if (externalValueReturnsNull)
- {
- return null;
- }
- Integer i = (Integer)value;
- return i.toString();
- }
-
- protected boolean internalValueEquals(Object left, Object right)
- {
- assertNotNull(left);
- assertNotNull(right);
- Integer li = (Integer)left;
- Integer ri = (Integer)right;
- return li.intValue() == ri.intValue();
- }
- }
-
-}
Added: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/TypedMapTestCase.java
===================================================================
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/TypedMapTestCase.java (rev 0)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/util/TypedMapTestCase.java 2007-11-15 15:54:55 UTC (rev 8947)
@@ -0,0 +1,462 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.portal.test.common.util;
+
+import junit.framework.TestCase;
+import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.common.util.TypedMap;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class TypedMapTestCase extends TestCase
+{
+
+ private StringToInteger sti;
+
+ private Map<String, Integer> delegate;
+
+ private StringToIntegerMap map;
+
+ public TypedMapTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ delegate = new HashMap<String, Integer>();
+ sti = new StringToInteger();
+ map = new StringToIntegerMap(delegate, sti);
+ }
+
+ public void testGetWithBrokenGetInternalValue()
+ {
+ sti.internalValueReturnsNull = true;
+ map.get("abc");
+ delegate.put("abc", new Integer(0));
+ map.get("abc");
+ }
+
+ public void testPutWithBrokenGetInternalValue()
+ {
+ sti.internalValueReturnsNull = true;
+ try
+ {
+ map.put("abc", "0");
+ fail();
+ }
+ catch (IllegalArgumentException e)
+ {
+ }
+ }
+
+ public void testRemoveWithBrokenGetInternalValue()
+ {
+ sti.internalValueReturnsNull = true;
+ map.remove("abc");
+ }
+
+ public void testRemoveWithBrokenGetExternalValue()
+ {
+ sti.externalValueReturnsNull = true;
+ map.remove("abc");
+ delegate.put("abc", new Integer(0));
+ try
+ {
+ map.remove("abc");
+ fail();
+ }
+ catch (IllegalStateException e)
+ {
+ }
+ }
+
+ public void testGetWithBrokenGetExternalValue()
+ {
+ sti.externalValueReturnsNull = true;
+ map.get("abc");
+ delegate.put("abc", new Integer(0));
+ try
+ {
+ map.get("abc");
+ fail();
+ }
+ catch (IllegalStateException e)
+ {
+ }
+ }
+
+ public void testPutWithBrokenGetExternalValue()
+ {
+ sti.externalValueReturnsNull = true;
+ map.put("abc", "0");
+ try
+ {
+ map.put("abc", "0");
+ fail();
+ }
+ catch (IllegalStateException e)
+ {
+ }
+ }
+
+ public void testGetWithInvalidInternalValue()
+ {
+ ((Map)delegate).put("abc", "0");
+ try
+ {
+ map.get("abc");
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testPutWithInvalidInternalValue()
+ {
+ ((Map)delegate).put("abc", "0");
+ try
+ {
+ map.put("abc", "0");
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testRemoveWithInvalidInternalValue()
+ {
+ ((Map)delegate).put("abc", "0");
+ try
+ {
+ map.remove("abc");
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testRemove()
+ {
+ assertNull(map.remove("abc"));
+ delegate.put("abc", new Integer(0));
+ assertEquals("0", map.remove("abc"));
+ assertTrue(delegate.isEmpty());
+ }
+
+ public void testPut()
+ {
+ map.put("abc", "0");
+ assertEquals(Collections.singletonMap("abc", new Integer(0)), delegate);
+ }
+
+ public void testGet()
+ {
+ assertNull(map.get("abc"));
+ delegate.put("abc", new Integer(0));
+ assertEquals(Collections.singletonMap("abc", "0"), map);
+ }
+
+ public void testContainsKeyWithInvalidKey()
+ {
+ try
+ {
+ map.containsKey(null);
+ fail();
+ }
+ catch (NullPointerException expected)
+ {
+ }
+ try
+ {
+ map.containsKey(new Object());
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testContainsValueWithInvalidValue()
+ {
+ try
+ {
+ map.containsValue(null);
+ fail();
+ }
+ catch (NullPointerException expected)
+ {
+ }
+ try
+ {
+ map.containsValue(new Object());
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testRemoveWithInvalidKey()
+ {
+ try
+ {
+ map.remove(null);
+ fail();
+ }
+ catch (NullPointerException expected)
+ {
+ }
+ try
+ {
+ map.remove(new Object());
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testGetWithInvalidKey()
+ {
+ try
+ {
+ map.get(null);
+ fail();
+ }
+ catch (NullPointerException expected)
+ {
+ }
+ try
+ {
+ map.get(new Object());
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testPutWithInvalidKey()
+ {
+ try
+ {
+ map.put(null, "0");
+ fail();
+ }
+ catch (NullPointerException expected)
+ {
+ }
+ try
+ {
+ ((Map)map).put(new Object(), "0");
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testWithPutInvalidValue()
+ {
+ try
+ {
+ map.put("", null);
+ fail();
+ }
+ catch (NullPointerException expected)
+ {
+ }
+ try
+ {
+ ((Map)map).put("", new Object());
+ fail();
+ }
+ catch (ClassCastException expected)
+ {
+ }
+ }
+
+ public void testEquals()
+ {
+ Map<String, Integer> leftDelegate = new HashMap<String, Integer>();
+ StringToIntegerMap left = new StringToIntegerMap(leftDelegate, sti);
+ leftDelegate.put("abc", new Integer(0));
+ Map right = new HashMap();
+
+ //
+ assertFalse(left.equals(right));
+ assertFalse(right.equals(left));
+
+ //
+ right.put("abc", new Object());
+ assertFalse(left.equals(right));
+ assertFalse(right.equals(left));
+
+ //
+ right.put("abc", "abc");
+ assertFalse(left.equals(right));
+ assertFalse(right.equals(left));
+
+ //
+ right.put("abc", "0");
+ assertTrue(left.equals(right));
+ assertTrue(right.equals(left));
+
+ //
+ right.put("def", "1");
+ assertFalse(left.equals(right));
+ assertFalse(right.equals(left));
+
+ //
+ right.remove("def");
+ right.put(null, "0");
+ assertFalse(left.equals(right));
+ assertFalse(right.equals(left));
+
+ //
+ right.remove(null);
+ right.put("def", null);
+ assertFalse(left.equals(right));
+ assertFalse(right.equals(left));
+ }
+
+ public void testEntrySetRetainAll()
+ {
+ Map right = new HashMap();
+ right.put("abc", new Integer(0));
+ right.put("def", new Integer(1));
+ right.put("ghi", new Integer(2));
+
+ //
+ Map<String, Integer> leftDelegate = new HashMap<String, Integer>();
+ StringToIntegerMap left = new StringToIntegerMap(leftDelegate, sti);
+ leftDelegate.putAll(right);
+
+ try
+ {
+ left.keySet().retainAll(null);
+ fail("Was expecting NPE");
+ }
+ catch (NullPointerException expected)
+ {
+ }
+
+ //
+ boolean changed = left.keySet().retainAll(CollectionBuilder.hashSet().add("abc").add("def").add("ghi").get());
+ assertFalse(changed);
+ assertEquals(right, leftDelegate);
+
+ //
+ changed = left.keySet().retainAll(CollectionBuilder.hashSet().add("def").get());
+ assertTrue(changed);
+ right.remove("abc");
+ right.remove("ghi");
+ assertEquals(right, leftDelegate);
+ }
+
+ public static class StringToIntegerMap extends TypedMap<String, String, String, Integer>
+ {
+ public StringToIntegerMap(Map<String, Integer> map, StringToInteger sti)
+ {
+ super(map, new StringToString(), sti);
+ }
+ }
+
+ private static class StringToString extends TypedMap.Converter<String, String>
+ {
+ protected String getInternal(String external) throws IllegalArgumentException, ClassCastException
+ {
+ return external;
+ }
+ protected String getExternal(String internal)
+ {
+ return internal;
+ }
+ protected boolean equals(String left, String right)
+ {
+ return left.equals(right);
+ }
+ }
+
+ private static class StringToInteger extends TypedMap.Converter<String, Integer>
+ {
+
+ /** . */
+ boolean internalValueReturnsNull = false;
+
+ /** . */
+ boolean externalValueReturnsNull = false;
+
+ protected Integer getInternal(String external) throws IllegalArgumentException, ClassCastException
+ {
+ assertNotNull(external);
+
+ //
+ if (internalValueReturnsNull)
+ {
+ return null;
+ }
+ try
+ {
+ return new Integer(external);
+ }
+ catch (NumberFormatException e)
+ {
+ IllegalArgumentException iae = new IllegalArgumentException();
+ iae.initCause(e);
+ throw iae;
+ }
+ }
+
+ protected String getExternal(Integer internal)
+ {
+ assertNotNull(internal);
+
+ //
+ if (externalValueReturnsNull)
+ {
+ return null;
+ }
+
+ //
+ return internal.toString();
+ }
+
+ protected boolean equals(Integer left, Integer right)
+ {
+ assertNotNull(left);
+ assertNotNull(right);
+ return left.intValue() == right.intValue();
+ }
+ }
+}
\ No newline at end of file
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8946 - modules/common/branches.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-15 09:49:38 -0500 (Thu, 15 Nov 2007)
New Revision: 8946
Removed:
modules/common/branches/JBP_COMMON_BRANCH_1_0/
Log:
dont create branch after all
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8945 - modules/common/branches.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-15 09:41:29 -0500 (Thu, 15 Nov 2007)
New Revision: 8945
Added:
modules/common/branches/JBP_COMMON_BRANCH_1_0/
Log:
branch common 1.0
Copied: modules/common/branches/JBP_COMMON_BRANCH_1_0 (from rev 8944, modules/common/tags/JBP_COMMON_1_0_0)
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8944 - modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-15 07:41:47 -0500 (Thu, 15 Nov 2007)
New Revision: 8944
Modified:
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/HibernateSupport.java
Log:
cleanup after yourself
Modified: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/HibernateSupport.java
===================================================================
--- modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-11-15 12:29:03 UTC (rev 8943)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-11-15 12:41:47 UTC (rev 8944)
@@ -197,7 +197,6 @@
{
createConfiguration();
createSessionFactory();
- destroySchema();
createSchema();
}
@@ -223,6 +222,7 @@
}
//
+ destroySchema();
destroySessionFactory();
destroyConfiguration();
}
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8943 - modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/portal/test/framework/embedded.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-15 07:29:03 -0500 (Thu, 15 Nov 2007)
New Revision: 8943
Modified:
modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
Log:
cleanup after yourself
Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
===================================================================
--- modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-11-15 12:23:02 UTC (rev 8942)
+++ modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-11-15 12:29:03 UTC (rev 8943)
@@ -197,7 +197,6 @@
{
createConfiguration();
createSessionFactory();
- destroySchema();
createSchema();
}
@@ -223,8 +222,10 @@
}
//
+ destroySchema();
destroySessionFactory();
destroyConfiguration();
+
}
public void destroy()
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8942 - branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-15 07:23:02 -0500 (Thu, 15 Nov 2007)
New Revision: 8942
Modified:
branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java
Log:
minor update
Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java
===================================================================
--- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java 2007-11-15 11:54:04 UTC (rev 8941)
+++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java 2007-11-15 12:23:02 UTC (rev 8942)
@@ -22,6 +22,9 @@
******************************************************************************/
package org.jboss.portal.presentation.server;
+import org.jboss.portal.presentation.RequestContext;
+import org.jboss.portal.presentation.model2.UIWindow;
+
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*
@@ -32,11 +35,23 @@
*
* @return
*/
- public Processor getProcessor();
+ Processor getProcessor();
/**
*
* @return
*/
- public PortalObjectReader getPortalObjectReader();
+ PortalObjectReader getPortalObjectReader();
+
+ /**
+ * Obtain the markup.
+ *
+ * @param context the request context
+ * @param window the window to get markup for
+ * @return the markup of the window
+ * @throws Exception for now a generic exception
+ */
+ String getMarkup(RequestContext context, UIWindow window) throws Exception;
+
+
}
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8941 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/ui/admin and 5 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-11-15 06:54:04 -0500 (Thu, 15 Nov 2007)
New Revision: 8941
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/IdentityUIUser.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml
Log:
JBPORTAL-1732: escaping backslash for link parameter
JBPORTAL-1768: deleted unused variable
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-11-15 11:54:04 UTC (rev 8941)
@@ -56,11 +56,8 @@
public DynamicUserAttribute(String username)
{
- this.map = new HashMap();
+ this();
this.username = username;
- FacesContext ctx = FacesContext.getCurrentInstance();
- this.identityUserBean = (IdentityUserBean) ctx.getApplication().createValueBinding(("#{identityusermgr}"))
- .getValue(ctx);
}
public Class getType(Object propertyName) throws IllegalArgumentException
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/IdentityUIUser.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/IdentityUIUser.java 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/IdentityUIUser.java 2007-11-15 11:54:04 UTC (rev 8941)
@@ -51,9 +51,9 @@
public String getUsername()
{
- return username;
+ return username;
}
-
+
public void setUsername(String username)
{
this.username = username;
@@ -73,4 +73,14 @@
{
return attribute;
}
+
+ /**
+ * Used for GET parameters - username does never contain a escape char
+ *
+ * @return double escaped username
+ */
+ public String getEscapedUsername()
+ {
+ return username.replace("\\", "\\\\");
+ }
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/UIRole.java 2007-11-15 11:54:04 UTC (rev 8941)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.core.identity.ui;
+import org.jboss.portal.identity.Role;
+
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
@@ -37,6 +39,20 @@
/** The role display name */
private String displayName;
+
+ public UIRole()
+ {
+ this.id = null;
+ this.name = null;
+ this.displayName = null;
+ }
+
+ public UIRole(Role role)
+ {
+ this.id = role.getId();
+ this.name = role.getName();
+ this.displayName = role.getDisplayName();
+ }
public String getDisplayName()
{
@@ -62,4 +78,14 @@
{
this.name = name;
}
+
+ /**
+ * Used for GET parameters - role name does never contain a escape char
+ *
+ * @return double escaped role
+ */
+ public String getEscapedName()
+ {
+ return name.replace("\\", "\\\\");
+ }
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-11-15 11:54:04 UTC (rev 8941)
@@ -138,7 +138,7 @@
Iterator i = set.iterator();
while (i.hasNext())
{
- Role role = (Role) i.next();
+ UIRole role = new UIRole((Role) i.next());
list.add(role);
}
this.roleList = new ListDataModel(list);
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-11-15 11:54:04 UTC (rev 8941)
@@ -64,11 +64,11 @@
</f:facet>
<h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
- <f:param name="currentUser" value="#{uiUser.username}"/>
+ <f:param name="currentUser" value="#{uiUser.escapedUsername}"/>
</h:commandLink> |
<h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
- <f:param name="currentUser" value="#{uiUser.username}"/>
+ <f:param name="currentUser" value="#{uiUser.escapedUsername}"/>
</h:commandLink>
</h:column>
</h:dataTable>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-11-15 11:54:04 UTC (rev 8941)
@@ -38,15 +38,15 @@
</f:facet>
<h:commandLink action="#{editrolemgr.editRole}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}" styleClass="actionRename"/>
- <f:param name="currentRole" value="#{role.name}"/>
+ <f:param name="currentRole" value="#{role.escapedName}"/>
</h:commandLink>
| <h:commandLink action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
- <f:param name="currentRole" value="#{role.name}"/>
+ <f:param name="currentRole" value="#{role.escapedName}"/>
</h:commandLink>
| <h:commandLink action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
- <f:param name="currentRole" value="#{role.name}"/>
+ <f:param name="currentRole" value="#{role.escapedName}"/>
</h:commandLink>
</h:column>
</h:dataTable>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-11-15 11:54:04 UTC (rev 8941)
@@ -74,20 +74,20 @@
</f:facet>
<h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
- <f:param name="currentUser" value="#{uiUser.username}"/>
+ <f:param name="currentUser" value="#{uiUser.escapedUsername}"/>
</h:commandLink> |
<h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionProperties">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
- <f:param name="currentUser" value="#{uiUser.username}"/>
+ <f:param name="currentUser" value="#{uiUser.escapedUsername}"/>
</h:commandLink> |
<h:commandLink action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}">
<h:outputText value="#{uiUser.attribute.enabled == true ? bundle.IDENTITY_MANAGEMENT_DISABLE : bundle.IDENTITY_MANAGEMENT_ENABLE}" />
- <f:param name="currentUser" value="#{uiUser.username}"/>
+ <f:param name="currentUser" value="#{uiUser.escapedUsername}"/>
<f:param name="enableAction" value="#{uiUser.attribute.enabled == true ? 'disable' : 'enable'}" />
</h:commandLink> |
<h:commandLink action="#{useradministrationbean.deleteUser}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
- <f:param name="currentUser" value="#{uiUser.username}"/>
+ <f:param name="currentUser" value="#{uiUser.escapedUsername}"/>
</h:commandLink>
</h:column>
</h:dataTable>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-11-15 11:54:04 UTC (rev 8941)
@@ -50,7 +50,7 @@
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
<h:commandLink action="#{lostpasswordmgr.adminResetPassword}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" />
- <f:param name="currentUser" value="#{manager.uiUser.username}" />
+ <f:param name="currentUser" value="#{manager.uiUser.escapedUsername}" />
</h:commandLink>
<h:panelGroup />
</c:when>
@@ -58,7 +58,7 @@
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
<h:commandLink action="#{manager.adminChangePassword}">
<h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
- <f:param name="currentUser" value="#{manager.uiUser.username}" />
+ <f:param name="currentUser" value="#{manager.uiUser.escapedUsername}" />
</h:commandLink>
<h:panelGroup />
</c:otherwise>
@@ -81,7 +81,7 @@
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
<h:commandLink action="changePassword">
<h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
- <f:param name="currentUser" value="#{manager.uiUser.username}" />
+ <f:param name="currentUser" value="#{manager.uiUser.escapedUsername}" />
</h:commandLink>
<h:panelGroup />
</c:otherwise>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml 2007-11-15 11:27:43 UTC (rev 8940)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml 2007-11-15 11:54:04 UTC (rev 8941)
@@ -16,7 +16,6 @@
<ui:decorate template="/WEB-INF/jsf/common/register.xhtml">
<ui:param name="manager" value="#{userregistermgr}"/>
- <ui:param name="showCaptcha" value="true"/>
</ui:decorate>
</ui:define>
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8940 - modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-15 06:27:43 -0500 (Thu, 15 Nov 2007)
New Revision: 8940
Modified:
modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/InfoTestCase.java
modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/TestParametrizationTestCase.java
Log:
Align with common-trunk
Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/InfoTestCase.java
===================================================================
--- modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/InfoTestCase.java 2007-11-15 10:56:16 UTC (rev 8939)
+++ modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/InfoTestCase.java 2007-11-15 11:27:43 UTC (rev 8940)
@@ -30,6 +30,7 @@
import java.util.Collections;
import java.util.HashSet;
+import java.util.Set;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -158,7 +159,10 @@
test.addParameter(p2);
assertEquals(p1, test.getParameter("p1"));
assertEquals(p2, test.getParameter("p2"));
- assertEquals(new CollectionBuilder().add("p1").add("p2").toHashSet(), test.getParameterNames());
+ Set set = new HashSet();
+ set.add("p1");
+ set.add("p2");
+ assertEquals(set, test.getParameterNames());
}
public void testId()
Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/TestParametrizationTestCase.java
===================================================================
--- modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/TestParametrizationTestCase.java 2007-11-15 10:56:16 UTC (rev 8939)
+++ modules/test/branches/JBP_TEST_BRANCH_1_0/test/src/main/org/jboss/test/TestParametrizationTestCase.java 2007-11-15 11:27:43 UTC (rev 8940)
@@ -30,8 +30,11 @@
import org.jboss.portal.test.framework.MultiValuedTestParameterValue;
import org.jboss.portal.common.util.CollectionBuilder;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -99,7 +102,10 @@
TestParametrization p2 = new TestParametrization();
p2.setParameterValue("foo", new MonoValuedTestParameterValue("foo1"));
p2.setParameterValue("abc", new MonoValuedTestParameterValue("def"));
- p2.setParameterValue("bar", new MultiValuedTestParameterValue(new CollectionBuilder().add("bar1").add("bar2").toArrayList()));
+ List list = new ArrayList();
+ list.add("bar1");
+ list.add("bar2");
+ p2.setParameterValue("bar", new MultiValuedTestParameterValue(list));
Collection c2 = p2.create(info);
assertNotNull(c2);
assertEquals(2, c2.size());
16 years, 11 months
- 1
- 0
JBoss Portal SVN: r8939 - in modules/test/trunk: build and 16 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-11-15 05:56:16 -0500 (Thu, 15 Nov 2007)
New Revision: 8939
Added:
modules/test/trunk/tooling/src/
modules/test/trunk/tooling/src/main/
modules/test/trunk/tooling/src/main/java/
modules/test/trunk/tooling/src/main/java/org/
modules/test/trunk/tooling/src/main/java/org/jboss/
modules/test/trunk/tooling/src/main/java/org/jboss/unit/
modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/
modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java
modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java
modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java
modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant/
modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2/
Removed:
modules/test/trunk/build/build-thirdparty.xml
modules/test/trunk/build/build.bat
modules/test/trunk/build/build.sh
modules/test/trunk/build/build.xml
modules/test/trunk/build/distrib.xml
modules/test/trunk/build/etc/
modules/test/trunk/mc/build.bat
modules/test/trunk/mc/build.sh
modules/test/trunk/mc/build.xml
modules/test/trunk/remote/build.bat
modules/test/trunk/remote/build.sh
modules/test/trunk/remote/build.xml
modules/test/trunk/test/build.bat
modules/test/trunk/test/build.sh
modules/test/trunk/test/build.xml
modules/test/trunk/testsuite/
modules/test/trunk/tooling/ant/src/main/java/
modules/test/trunk/tooling/build.bat
modules/test/trunk/tooling/build.sh
modules/test/trunk/tooling/build.xml
modules/test/trunk/tooling/core/
modules/test/trunk/tooling/maven2/src/main/java/
modules/test/trunk/tools/
modules/test/trunk/unit/build.bat
modules/test/trunk/unit/build.sh
modules/test/trunk/unit/build.xml
Modified:
modules/test/trunk/pom.xml
modules/test/trunk/tooling/ant/pom.xml
modules/test/trunk/tooling/maven2/pom.xml
modules/test/trunk/tooling/pom.xml
Log:
remove ant and reorganize tooling submodules
Deleted: modules/test/trunk/build/build-thirdparty.xml
===================================================================
--- modules/test/trunk/build/build-thirdparty.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/build/build-thirdparty.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<project name="main.build"
- default="synchronize"
- basedir=".">
-
- <!-- Property File definitions -->
- <!--<property file="local.properties"/>
- <property file="synchronize.properties"/>-->
- <property environment="env"/>
-
- <!-- Property Definitions -->
- <property name="generatedLibrariesFiles" value="../thirdparty/libraries.ent"/>
-
-
- <property name="jboss.tasks.path"
- value="../tools/lib/jbossbuild.jar"/>
-
- <!-- Allow jbossbuild.repository to be set from (in order or priority)
- + Command line -Djbossbuild.repository=...
- + synchronize.properties jbossbuild.repository setting
- + JBOSS_REPOSITORY environment variable
- -->
- <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
- <isset property="env.JBOSS_REPOSITORY"/>
- </condition>
- <!-- Fall back to default -->
- <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
-
- <!-- File Imports -->
- <import file="../tools/etc/jbossbuild/tasks.xml"/>
-
-
- <!-- Main Definition of dependencies -->
- <build id="jbossportal-thirdparty"
- impltitle="JBossPortal"
- implversion="1.0.0"
- implvendor="JBoss, a division of Red Hat Inc."
- implurl="http://www.jboss.org"
- description="JBoss Portal"
- cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
- thirdpartypath="../thirdparty/"
- location="${jbossbuild.repository}"
- targetdefs="targets">
-
- <!--
- The repository is in CVS under the module repository.jboss.com whose contents
- are pushed to the http://repository.jboss.com site.
- -->
-
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
-
- <componentref name="apache-ant" version="1.6.5-junit"/>
-
- <componentref name="codehaus/cargo" version="0.9-portal"/>
-
- <componentref name="hibernate" version="3.2.0.CR2"/>
- <componentref name="apache-log4j" version="1.2.14"/>
- <componentref name="junit" version="3.8.1"/>
- <componentref name="sun-servlet" version="2.4"/>
- <componentref name="apache-httpclient" version="3.0.1"/>
- <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
- <componentref name="sun-opends" version="snapshot"/>
- <componentref name="jboss/remoting" version="2.2.1.GA"/>
-
- <!-- For embedding components -->
- <componentref name="jbossas/core-libs" version="4.0.4.GA"/>
-
- <!-- MC 2.0.0.Beta4 -->
- <componentref name="jboss/microcontainer" version="2.0.0.Beta4"/>
- <componentref name="jboss/aop" version="2.0.0.alpha6"/>
- <componentref name="jboss/jbossxb" version="2.0.0.CR4"/>
- <componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/>
- <componentref name="jboss/common-core" version="2.2.1.GA"/>
- <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/> <!-- 2.0.3.GA -->
- <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/> <!-- 2.0.3.GA -->
- <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/> <!-- 2.0.3.GA -->
- <componentref name="javassist" version="3.6.0.CR1"/> <!-- 3.6-beta -->
- <componentref name="apache-xerces" version="2.7.1"/>
- <componentref name="junit" version="3.8.1"/>
- <componentref name="apache-log4j" version="1.2.14"/>
- <componentref name="sun-jaf" version="1.1"/>
- <componentref name="wutka-dtdparser" version="1.2.1"/>
- <componentref name="trove" version="1.0.2"/> <!-- 2.1.1 -->
-
-
- <!-- MC 2.0.0.Beta3 -->
-<!--
- <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/>
- <componentref name="jboss/aop" version="2.0.0.alpha4"/>
- <componentref name="jboss/jbossxb" version="2.0.0.CR2"/>
- <componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/>
- <componentref name="jboss/common-core" version="2.0.4.Alpha"/>
- <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
- <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
- <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
- <componentref name="javassist" version="3.5.0.CR1"/>
- <componentref name="apache-log4j" version="1.2.14"/>
- <componentref name="apache-xerces" version="2.7.1"/>
- <componentref name="sun-jaf" version="1.1"/>
- <componentref name="junit" version="3.8.1"/>
- <componentref name="wutka-dtdparser" version="1.2.1"/>
- <componentref name="trove" version="1.0.2"/>
--->
-
- </build>
-
- <synchronizeinfo/>
-
- <target name="generate-lib-file"
- description="generate libraries.ent and thirdparty license info"
- depends="synchronize">
- <gen-lib-file filename="${generatedLibrariesFiles}"/>
- <visit-componentref-graph
- componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
- </target>
-
- <!-- Generate the targets -->
- <generate generate="jbossportal-thirdparty"/>
-
-
-
-</project>
Deleted: modules/test/trunk/build/build.bat
===================================================================
--- modules/test/trunk/build/build.bat 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/build/build.bat 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,54 +0,0 @@
-@echo off
-rem
-rem Invokes a script of the same name in the 'tools' module.
-rem
-rem The 'tools' module is expected to be a peer directory of the directory
-rem in which this script lives.
-rem
-rem @author Jason Dillon <jason(a)planet57.com>
-rem
-
-rem $Id: build.bat 2 2005-01-14 23:01:32Z vietj $
-
-setlocal
-
-set PROGNAME=%~nx0
-set DIRNAME=%~dp0
-
-rem Legacy shell support
-if x%PROGNAME%==x set PROGNAME=build.bat
-if x%DIRNAME%==x set DIRNAME=.\
-
-set MODULE_ROOT=%DIRNAME%
-if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
-set TARGET=%TOOLS_ROOT%\bin\build.bat
-set ARGS=%*
-
-rem Start'er up yo
-goto main
-
-:debug
-if not x%DEBUG%==x echo %PROGNAME%: %*
-goto :EOF
-
-:main
-call :debug PROGNAME=%PROGNAME%
-call :debug DIRNAME=%DIRNAME%
-call :debug TOOLS_ROOT=%TOOLS_ROOT%
-call :debug TARGET=%TARGET%
-
-if exist %TARGET% call :call-script & goto :EOF
-rem else fail, we can not go on
-
-echo %PROGNAME%: *ERROR* The target executable does not exist:
-echo %PROGNAME%:
-echo %PROGNAME%: %TARGET%
-echo %PROGNAME%:
-echo %PROGNAME%: Please make sure you have checked out the 'tools' module
-echo %PROGNAME%: and make sure it is up to date.
-goto :EOF
-
-:call-script
-call :debug Executing %TARGET% %ARGS%
-call %TARGET% %ARGS%
-goto :EOF
Deleted: modules/test/trunk/build/build.sh
===================================================================
--- modules/test/trunk/build/build.sh 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/build/build.sh 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,49 +0,0 @@
-#!/bin/sh
-##
-## Invokes a script of the same name in the 'tools' module.
-##
-## The 'tools' module is expected to be a peer directory of the directory
-## in which this script lives.
-##
-## @author Jason Dillon <jason(a)planet57.com>
-##
-
-# $Id: build.sh 2 2005-01-14 23:01:32Z vietj $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-
-# Buss it yo
-main() {
- if [ "x$TOOLS_ROOT" = "x" ]; then
- TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
- fi
-
- MODULE_ROOT=`cd $DIRNAME; pwd`
- export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
-
- # Where is the target script?
- target="$TOOLS_ROOT/bin/$PROGNAME"
- if [ ! -f "$target" ]; then
- echo "${PROGNAME}: *ERROR* The target executable does not exist:"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: $target"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
- echo "${PROGNAME}: and make sure it is up to date."
- exit 2
- fi
-
- # Get busy yo!
- if [ "x$DEBUG" != "x" ]; then
- echo "${PROGNAME}: Executing: /bin/sh $target $@"
- fi
- if [ "x$TRACE" = "x" ]; then
- exec /bin/sh $target "$@"
- else
- exec /bin/sh -x $target "$@"
- fi
-}
-
-# Lets get ready to rumble!
-main "$@"
Deleted: modules/test/trunk/build/build.xml
===================================================================
--- modules/test/trunk/build/build.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/build/build.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
-
-
- ]>
-
-<!-- $Id: build.xml 7880 2007-08-09 12:38:58Z thomas.heute(a)jboss.com $ -->
-
-<!--+======================================================================+-->
-<!--| JBoss Portal: The OpenSource Portal |-->
-<!--| |-->
-<!--| Distributable under LGPL license. |-->
-<!--| See terms of license at http://www.gnu.org. |-->
-<!--| |-->
-<!--| This file has been designed to work with the 'tools' module and |-->
-<!--| Buildmagic extentions. |-->
-<!--+======================================================================+-->
-
-<project default="main" name="JBoss Portal">
-
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
- <!--| Include the common build elements. |-->
- <!--| |-->
- <!--| This defines several different targets, properties and paths. |-->
- <!--| It also sets up the basic extention tasks amoung other things. |-->
- <!--+====================================================================+-->
-
- &buildmagic;
- &modules;
- &defaults;
-
- <!--+====================================================================+-->
- <!--| Initialization |-->
- <!--| |-->
- <!--| Initialize the build system. Other targets should depend on |-->
- <!--| 'init'. |-->
- <!--+====================================================================+-->
-
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
-
-
- <!--+====================================================================+-->
- <!--| Configuration |-->
- <!--| |-->
- <!--| This target is invoked by the Buildmagic initialization logic |-->
- <!--| and should contain module specific configuration elements. |-->
- <!--+====================================================================+-->
-
- <target name="configure" unless="configure.disable">
-
- <!--+==============================+-->
- <!--| Project version information. |-->
- <!--+==============================+-->
-
- <property name="version.major" value="1"/>
- <property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="GA"/>
- <property name="version.name" value=""/>
-
- <!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="HEAD"/>
-
- <!-- Module name(s) & version -->
- <property name="module.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <!-- The combined library classpath -->
-
- <path id="library.classpath">
- </path>
-
- <!-- Configure modules -->
- <call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <!-- Add dependent module classpath elements here. -->
- </path>
-
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
-
- <!-- Configure defaults & build tools -->
-
- <call target="configure-defaults"/>
-
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
-
- <!--+================================+-->
- <!--| Define project structure here. |-->
- <!--+================================+-->
-
- <!-- The group to use by default -->
- <property name="groups" value="default"/>
-
- <!-- Sets up the module configuration. -->
- <moduleconfig property="modules" selected="${groups}">
-
- <!-- Modules -->
-
- <module name="test"/>
- <module name="unit"/>
- <module name="mc"/>
- <module name="remote"/>
- <module name="tooling"/>
-
- <!-- Module groups -->
-
- <group name="test">
- <include
- modules="test,unit,mc,remote,tooling"/>
- </group>
-
- <group name="default">
- <include groups="test"/>
- </group>
-
- </moduleconfig>
-
- <!-- Configure project defaults -->
- <call target="configure-project"/>
-
- </target>
- <target name="modules-all" depends="_buildmagic:modules:all"/>
- <target name="modules-most" depends="_buildmagic:modules:most"/>
- <target name="modules-main" depends="_buildmagic:modules:main"/>
- <target name="modules-release" depends="_buildmagic:modules:release"/>
- <target name="modules-tests" depends="_buildmagic:modules:tests"/>
- <target name="modules-clean" depends="_buildmagic:modules:clean"/>
- <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
- <target name="modules-package-tests" depends="_buildmagic:modules:package-tests"/>
-
- <!--+====================================================================+-->
- <!--| Module Pass-through Hooks |-->
- <!--| |-->
- <!--| These hooks are executed after the above pass-through targets have |-->
- <!--| finished with a given module. |-->
- <!--+====================================================================+-->
-
- <!-- Add module pass-through hooks here. -->
-
-
- <!--+====================================================================+-->
- <!--| Compile |-->
- <!--| |-->
- <!--| This target should depend on other compile-* targets for each |-->
- <!--| different type of compile that needs to be performed, short of |-->
- <!--| documentation compiles. |-->
- <!--+====================================================================+-->
-
- <target name="compile"/>
-
- <!--+====================================================================+-->
- <!--| Generate Output |-->
- <!--| |-->
- <!--| Generates the target output for this module. Target output is |-->
- <!--| the output which is ment to be released or used by external |-->
- <!--| modules. |-->
- <!--+====================================================================+-->
-
- <target name="output"
- description="Generate all target output."
- depends="init">
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs">
- <ant antfile="build-targets.xml" target="_default:docs"/>
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Install & Release |-->
- <!--+====================================================================+-->
-
- <target name="release"
- description="Builds the default release structure."
- depends="modules-most, output"/>
-
- <target name="release-full"
- description="Builds the full release structure."
- depends="modules-all, release"/>
-
- <!--+====================================================================+-->
- <!--| Misc. |-->
- <!--| |-->
- <!--| Standard targets and pseudo-targets. |-->
- <!--+====================================================================+-->
-
- <target name="clean" depends="createthirdparty, modules-clean, _buildmagic:clean"
- description="Cleans up most generated files.">
- <!-- Add module specific elements here. -->
- </target>
-
- <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber"
- description="Cleans up all generated files.">
- <!-- Add module specific elements here. -->
- </target>
-
- <target name="main" depends="most"
- description="Executes the default target (most)."/>
-
- <target name="all" depends="createthirdparty, modules-all"
- description="Executes all modules and builds everything."/>
-
- <target name="most" depends="createthirdparty, modules-most"
- description="Executes all modules and builds most everything."/>
-
- <target name="help" depends="_buildmagic:help:build"
- description="Show this help message."/>
-
- <!--
- | Deploy the application
- -->
-
- <!--<target name="initsetup">-->
- <!--<available property="cmsdata" file="${jboss.home}/server/${portal.deploy.dir}/data/portal"/> -->
- <!--</target>-->
-
- <!--<target name="setup" depends="initsetup" unless="cmsdata">-->
- <!--<unzip src="../core/src/bin/setup/cms-content.zip" dest="${jboss.home}/server/${portal.deploy.dir}/data"/>-->
- <!--</target>-->
-
- <target name="deploy"
- description="Deploy."
- depends="main">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}"
- overwrite="true"/>
- </target>
-
- <target name="undeploy"
- description="Undeploy."
- depends="init">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
- </target>
-
- <target name="deploy-all"
- description="Deploy all archives."
- depends="most">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-admin/output/lib//portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-cms/output/lib/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-management/output/lib/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>-->
- <copy file="../widget/output/lib/widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- </target>
-
- <target name="undeploy-all"
- description="Undeploy all archives."
- depends="init">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-admin.sar"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cms.sar"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-management.sar"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-news-samples.war"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/>
- <!--<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/>-->
- <delete file="${jboss.home}/server/${portal.deploy.dir}/widget.war"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/>
- </target>
-
- <target name="exploded-deploy"
- description="Deploy exploded sar."
- depends="main">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/>
- <mkdir dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/>
- <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar">
- <fileset dir="../core/output/resources/jboss-portal.sar"/>
- </copy>
- </target>
-
- <target name="javadoc">
- <mkdir dir="javadoc"/>
- <javadoc destdir="javadoc">
- <classpath>
- <fileset dir="../thirdparty" includes="**/*.jar"/>
- </classpath>
- <packageset dir="../test/src/main">
- <exclude name="org/jboss/test/**"/>
- </packageset>
- </javadoc>
- </target>
-
- <!-- create the thirdparty folder from items in the repository -->
- <!-- then generate a new libraries.ent file and include it in -->
- <!-- the build -->
- <target name="createthirdparty" unless="inhibit.downloads"
- depends="check.inhibit.downloads">
- <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
- </target>
-
- <!-- check if thirdparty libraries are to be downloaded -->
- <target name="check.inhibit.downloads">
- <condition property="inhibit.downloads">
- <or>
- <uptodate property="dependencies.current"
- srcfile="build-thirdparty.xml"
- targetfile="../thirdparty/libraries.ent"/>
- <istrue value="${nodownload}"/>
- </or>
- </condition>
- </target>
-
-</project>
Deleted: modules/test/trunk/build/distrib.xml
===================================================================
--- modules/test/trunk/build/distrib.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/build/distrib.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,398 +0,0 @@
-<project default="main" name="JBoss Portal">
-
- <property name="source.dir" value="../../jboss-portal-2.6"/>
- <property name="docs.dir" value="${source.dir}-docs"/>
- <property name="release.version" value="2.6.1.GA"/>
-
- <!-- -->
- <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
- <property name="portal.release.ha.name" value="jboss-portal-ha-${release.version}"/>
-
- <!-- -->
- <property name="portal.build.src" value="output/${portal.release.normal.name}-src"/>
- <property name="portal.build.normal.bin" value="output/${portal.release.normal.name}"/>
- <property name="portal.build.ha.bin" value="output/${portal.release.ha.name}"/>
- <property name="portal.build.normal.bundled" value="output/${portal.release.normal.name}-bundled"/>
- <property name="portal.build.ha.bundled" value="output/${portal.release.ha.name}-bundled"/>
-
- <property environment="env"/>
-
- <target name="init" unless="jboss.home">
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <echo message="Using JBoss install from $JBOSS_HOME: ${jboss.home}"/>
- </target>
-
- <!--
- <property name="forums.release.name" value="jboss-forums-${release.version}"/>
- <property name="forums.build.bin" value="output/${forums.release.name}"/>
- <property name="forums.build.src" value="output/${forums.release.name}-src"/>
- -->
- <!-- Licenses -->
- <target name="licenses">
- <fileset id="thirdparty-licenses" dir="../thirdparty/licenses">
- <include name="antlr.txt"/>
- <include name="apache-2.0.txt"/>
- <include name="bsd.txt"/>
- <include name="cddl.txt"/>
- <include name="cpl-1.0/txt"/>
- <include name="day-jcr.txt"/>
- <include name="dom4j.txt"/>
- <include name="ehcache.txt"/>
- <include name="gpl.txt"/>
- <include name="hsqldb.txt"/>
- <include name="httpunit.txt"/>
- <include name="ironsmith.txt"/>
- <include name="lgpl.txt"/>
- <include name="nekohtml.txt"/>
- <include name="oswego.txt"/>
- <include name="public-domain.txt"/>
- <include name="slf4j.txt"/>
- <include name="sun-jaf.txt"/>
- <include name="sun-javamail.txt"/>
- <include name="xdoclet.txt"/>
- </fileset>
- <mkdir dir="output/docs/licenses"/>
- <concat destfile="output/docs/licenses/thirdparty-licenses.txt">
- <fileset refid="thirdparty-licenses"/>
- </concat>
- <copy todir="output/docs/licenses">
- <fileset refid="thirdparty-licenses"/>
- <fileset dir="licences" includes="JBossEULA.txt"/>
- </copy>
- </target>
-
- <!-- Normal build -->
- <target name="_normal.build" depends="init" unless="normal.build.done">
- <ant dir="${source.dir}/build" antfile="build.xml"/>
-
- <!-- to prevent building several times -->
- <property name="normal.build.done" value="true"/>
- </target>
-
- <!-- Build JBoss Portal artifacts -->
- <target name="source.build" depends="_normal.build">
- <!-- HA specific targets -->
- <ant dir="${source.dir}/core" antfile="build.xml" target="output-ha"/>
- <ant dir="${source.dir}/core-cms" antfile="build.xml" target="output-ha"/>
-
- <!-- Datasource files -->
- <ant dir="${source.dir}/core" antfile="build.xml" target="datasource">
- <!-- Hack because invoking the datasource generation from another build file replace ${/} -->
- <property name="/" value="${/}"/>
- </ant>
-
- <ant dir="${source.dir}/wsrp" antfile="build.xml" target="output"/>
- <ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/>
- </target>
-
- <!-- Build JBoss Portal documentation -->
- <target name="doc.build" depends="_normal.build" unless="no-doc">
- <ant dir="${docs.dir}/referenceGuide" antfile="build.xml"/>
- <ant dir="${docs.dir}/userGuide" antfile="build.xml"/>
- <ant dir="${docs.dir}/quickstartuser" antfile="build.xml"/>
- </target>
-
- <!-- Build JBoss Portal -->
- <target name="build" depends="source.build,doc.build"/>
-
-
- <!--<macrodef name="package-doc">
- <attribute name="todir"/>
- <sequential>
- <mkdir dir="${todir}"/>
- <mkdir dir="${todir}/referenceGuide"/>
- <copy todir="${todir}/referenceGuide">
- <fileset dir="${docs.dir}/referenceGuide/build/en/"/>
- </copy>
- <mkdir dir="${todir}/userGuide"/>
- <copy todir="${todir}/userGuide">
- <fileset dir="${docs.dir}/userGuide/build/en/"/>
- </copy>
- <mkdir dir="${todir}/quickstartuser"/>
- <copy todir="${todir}/quickstartuser">
- <fileset dir="${docs.dir}/quickstartuser/build/en/"/>
- </copy>
- </sequential>
- </macrodef>-->
-
- <target name="package-doc">
- <sequential>
- <mkdir dir="${todir}"/>
- <mkdir dir="${todir}/referenceGuide"/>
- <copy todir="${todir}/referenceGuide">
- <fileset dir="${docs.dir}/referenceGuide/build/en/"/>
- </copy>
- <mkdir dir="${todir}/userGuide"/>
- <copy todir="${todir}/userGuide">
- <fileset dir="${docs.dir}/userGuide/build/en/"/>
- </copy>
- <mkdir dir="${todir}/quickstartuser"/>
- <copy todir="${todir}/quickstartuser">
- <fileset dir="${docs.dir}/quickstartuser/build/en/"/>
- </copy>
- </sequential>
- </target>
-
- <target name="package-ds">
- <sequential>
- <mkdir dir="${todir}"/>
- <copy todir="${todir}">
- <fileset dir="${source.dir}/core/output/resources/setup" includes="portal-*-ds.xml"/>
- </copy>
- </sequential>
- </target>
-
- <target name="package-samples">
- <sequential>
- <mkdir dir="${todir}"/>
- <copy todir="${todir}">
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar/**"/>
- </copy>
- <copy file="${docs.dir}/readmeFiles/samples-readme.txt" tofile="${todir}/readme.txt"/>
- </sequential>
- </target>
-
- <target name="patch-log4j">
- <patch patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff"
- originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/>
- </target>
-
- <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc-->
- <target name="package-bin" unless="no-doc">
- <sequential>
- <mkdir dir="${todir}"/>
- <antcall target="package-doc">
- <param name="todir" value="${todir}/docs"/>
- </antcall>
- <antcall target="package-ds">
- <param name="todir" value="${todir}/setup"/>
- </antcall>
- <antcall target="package-samples">
- <param name="todir" value="${todir}/samples"/>
- </antcall>
- <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
- <copy todir="${todir}/docs/portal/licenses">
- <fileset dir="output/docs/licenses"/>
- </copy>
- </sequential>
- </target>
-
- <target name="package-bundled" unless="no-doc">
- <sequential>
- <mkdir dir="${todir}"/>
- <antcall target="package-doc">
- <param name="todir" value="${todir}/docs/portal"/>
- </antcall>
- <antcall target="package-ds">
- <param name="todir" value="${todir}/setup"/>
- </antcall>
- <antcall target="package-samples">
- <param name="todir" value="${todir}/samples"/>
- </antcall>
- <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/>
- <copy todir="${todir}/docs/portal/licenses">
- <fileset dir="output/docs/licenses"/>
- </copy>
- </sequential>
- </target>
-
- <!-- -->
- <target name="package">
-
- <!-- Create the output directory -->
- <mkdir dir="output"/>
-
- <!--
- | JBoss Portal source distribution
- -->
-
- <mkdir dir="${portal.build.src}"/>
- <antcall target="package-doc">
- <param name="todir" value="${portal.build.src}/docs"/>
- </antcall>
- <copy file="${docs.dir}/readmeFiles/jboss-portal-src.README" todir="${portal.build.src}"/>
- <copy todir="${portal.build.src}">
- <fileset dir="${source.dir}" includes="**/*"
- excludes="*/output/**,**/CVS/*,**/build.log,build/local.properties,forums/**,thirdparty/**"/>
- </copy>
- <copy todir="${portal.build.src}/docs/portal/licenses">
- <fileset dir="output/docs/licenses"/>
- </copy>
- <fixcrlf srcdir="${portal.build.src}" includes="**/*.sh" eol="lf" eof="remove"/>
- <fixcrlf srcdir="${portal.build.src}" includes="**/*.bat" eol="crlf"/>
-
- <!--
- | JBoss Portal binaries distribution
- -->
-
- <antcall target="package-normal"/>
- <antcall target="package-ha"/>
- <antcall target="package-normal-bundled"/>
- <antcall target="package-ha-bundled"/>
- </target>
-
- <!--
- | JBoss Portal binary distribution
- -->
-
- <target name="package-normal" description="package jboss-portal.sar">
- <mkdir dir="${portal.build.normal.bin}"/>
- <antcall target="package-bin">
- <param name="todir" value="${portal.build.normal.bin}"/>
- </antcall>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
- <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
- </copy>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-cms.sar">
- <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
- </copy>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar">
- <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
- <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
- <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
- </copy>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples">
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/>
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/>
- </copy>
- <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/>
- <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar">
- <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
- </copy>
- </target>
-
- <!--
- | JBoss Portal ha binaries distribution
- -->
- <target name="package-ha" description="package jboss-portal-ha.sar">
- <mkdir dir="${portal.build.ha.bin}"/>
- <antcall target="package-bin">
- <param name="todir" value="${portal.build.ha.bin}"/>
- </antcall>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
- <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar">
- <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
- <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
- <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
- <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
- </copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/samples">
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/>
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/>
- </copy>
- <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar">
- <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
- </copy>
- <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/>
- </target>
-
-
- <!--
- | JBoss Portal bundled distribution
- -->
- <target name="package-normal-bundled" depends="package-normal" if="jboss.home"
- description="package jboss-portal bundled with JBoss AS">
- <mkdir dir="${portal.build.normal.bundled}"/>
- <antcall target="package-bundled">
- <param name="todir" value="${portal.build.normal.bundled}"/>
- </antcall>
- <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar">
- <fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/>
- </copy>
- <copy todir="${portal.build.normal.bundled}/server/default/deploy">
- <fileset dir="${portal.build.normal.bin}/setup" includes="portal-hsqldb-ds.xml"/>
- </copy>
- <copy todir="${portal.build.normal.bundled}">
- <fileset dir="${jboss.home}">
- <include name="bin/**"/>
- <include name="client/**"/>
- <include name="docs/**"/>
- <include name="lib/**"/>
- <include name="server/default/**"/>
- </fileset>
- </copy>
- <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${portal.build.normal.bundled}"/>
- <antcall target="patch-log4j">
- <param name="todir" value="${portal.build.normal.bundled}/server/default"/>
- </antcall>
- </target>
-
- <!--
- | JBoss Portal ha bundled distribution
- -->
-
- <target name="package-ha-bundled" depends="package-ha" if="jboss.home"
- description="package jboss-portal-ha bundled with JBoss AS">
- <mkdir dir="${portal.build.ha.bundled}"/>
- <antcall target="package-bundled">
- <param name="todir" value="${portal.build.ha.bundled}"/>
- </antcall>
- <copy todir="${portal.build.ha.bundled}/server/all/deploy/jboss-portal-ha.sar">
- <fileset dir="${portal.build.ha.bin}/jboss-portal-ha.sar"/>
- </copy>
- <copy todir="${portal.build.ha.bundled}">
- <fileset dir="${jboss.home}">
- <include name="bin/**"/>
- <include name="client/**"/>
- <include name="docs/**"/>
- <include name="lib/**"/>
- <include name="server/all/**"/>
- </fileset>
- </copy>
- <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/>
- <antcall target="patch-log4j">
- <param name="todir" value="${portal.build.normal.bundled}/server/default"/>
- </antcall>
-
- </target>
-
- <!-- Create packages -->
- <target name="zip">
-
- <tar destfile="${portal.build.src}.tar.gz"
- compression="gzip">
- <tarfileset prefix="${portal.release.normal.name}-src" filemode="775" dir="${portal.build.src}"/>
- </tar>
- <checksum file="${portal.build.src}.tar.gz"/>
-
- <zip destfile="${portal.build.normal.bin}.zip">
- <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bin}"/>
- </zip>
- <checksum file="${portal.build.normal.bin}.zip"/>
-
- <zip destfile="${portal.build.ha.bin}.zip">
- <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bin}"/>
- </zip>
- <checksum file="${portal.build.ha.bin}.zip"/>
-
- <zip destfile="${portal.build.normal.bundled}.zip">
- <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bundled}"/>
- </zip>
- <checksum file="${portal.build.normal.bin}.zip"/>
-
- <zip destfile="${portal.build.ha.bundled}.zip">
- <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bundled}"/>
- </zip>
- <checksum file="${portal.build.ha.bundled}.zip"/>
-
- <!--
- <tar destfile="${forums.build.src}.tar.gz"
- compression="gzip">
- <tarfileset dir="output/${forums.release.name}-src"
- prefix="${forums.release.name}-src"/>
- </tar>
- <zip destfile="${forums.build.bin}.zip"
- basedir="output/${forums.release.name}"/>
- -->
- </target>
-
- <!-- Build and compress everything -->
- <target name="main" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/>
-</project>
Deleted: modules/test/trunk/mc/build.bat
===================================================================
--- modules/test/trunk/mc/build.bat 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/mc/build.bat 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,54 +0,0 @@
-@echo off
-rem
-rem Invokes a script of the same name in the 'tools' module.
-rem
-rem The 'tools' module is expected to be a peer directory of the directory
-rem in which this script lives.
-rem
-rem @author Jason Dillon <jason(a)planet57.com>
-rem
-
-rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $
-
-setlocal
-
-set PROGNAME=%~nx0
-set DIRNAME=%~dp0
-
-rem Legacy shell support
-if x%PROGNAME%==x set PROGNAME=build.bat
-if x%DIRNAME%==x set DIRNAME=.\
-
-set MODULE_ROOT=%DIRNAME%
-if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
-set TARGET=%TOOLS_ROOT%\bin\build.bat
-set ARGS=%*
-
-rem Start'er up yo
-goto main
-
-:debug
-if not x%DEBUG%==x echo %PROGNAME%: %*
-goto :EOF
-
-:main
-call :debug PROGNAME=%PROGNAME%
-call :debug DIRNAME=%DIRNAME%
-call :debug TOOLS_ROOT=%TOOLS_ROOT%
-call :debug TARGET=%TARGET%
-
-if exist %TARGET% call :call-script & goto :EOF
-rem else fail, we can not go on
-
-echo %PROGNAME%: *ERROR* The target executable does not exist:
-echo %PROGNAME%:
-echo %PROGNAME%: %TARGET%
-echo %PROGNAME%:
-echo %PROGNAME%: Please make sure you have checked out the 'tools' module
-echo %PROGNAME%: and make sure it is up to date.
-goto :EOF
-
-:call-script
-call :debug Executing %TARGET% %ARGS%
-call %TARGET% %ARGS%
-goto :EOF
Deleted: modules/test/trunk/mc/build.sh
===================================================================
--- modules/test/trunk/mc/build.sh 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/mc/build.sh 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,49 +0,0 @@
-#!/bin/sh
-##
-## Invokes a script of the same name in the 'tools' module.
-##
-## The 'tools' module is expected to be a peer directory of the directory
-## in which this script lives.
-##
-## @author Jason Dillon <jason(a)planet57.com>
-##
-
-# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-
-# Buss it yo
-main() {
- if [ "x$TOOLS_ROOT" = "x" ]; then
- TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
- fi
-
- MODULE_ROOT=`cd $DIRNAME; pwd`
- export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
-
- # Where is the target script?
- target="$TOOLS_ROOT/bin/$PROGNAME"
- if [ ! -f "$target" ]; then
- echo "${PROGNAME}: *ERROR* The target executable does not exist:"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: $target"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
- echo "${PROGNAME}: and make sure it is up to date."
- exit 2
- fi
-
- # Get busy yo!
- if [ "x$DEBUG" != "x" ]; then
- echo "${PROGNAME}: Executing: /bin/sh $target $@"
- fi
- if [ "x$TRACE" = "x" ]; then
- exec /bin/sh $target "$@"
- else
- exec /bin/sh -x $target "$@"
- fi
-}
-
-# Lets get ready to rumble!
-main "$@"
Deleted: modules/test/trunk/mc/build.xml
===================================================================
--- modules/test/trunk/mc/build.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/mc/build.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
- ]>
-
-<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ -->
-
-<!--+======================================================================+-->
-<!--| JBoss Portal (The OpenSource Portal) Build File |-->
-<!--| |-->
-<!--| Distributable under LGPL license. |-->
-<!--| See terms of license at http://www.gnu.org. |-->
-<!--| |-->
-<!--| This file has been designed to work with the 'tools' module and |-->
-<!--| Buildmagic extentions. |-->
-<!--+======================================================================+-->
-
-<project default="main" name="JBoss Portal">
-
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
- <!--| Include the common build elements. |-->
- <!--| |-->
- <!--| This defines several different targets, properties and paths. |-->
- <!--| It also sets up the basic extention tasks amoung other things. |-->
- <!--+====================================================================+-->
-
- &buildmagic;
- &modules;
- &defaults;
- &tools;
- &targets;
-
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
-
- <!--+====================================================================+-->
- <!--| Configuration |-->
- <!--| |-->
- <!--| This target is invoked by the Buildmagic initialization logic |-->
- <!--| and should contain module specific configuration elements. |-->
- <!--+====================================================================+-->
-
- <target name="configure" unless="configure.disable">
-
- <!-- Configure thirdparty libraries -->
- &libraries;
- <path id="library.classpath">
- <path refid="junit.junit.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss/common.core.classpath"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- </path>
-
- <!-- Configure modules -->
- <call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <path refid="jboss.unit.classpath"/>
- </path>
-
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
-
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
- <property name="javadoc.private" value="false"/>
- <property name="javadoc.protected" value="false"/>
- <property name="javadoc.packages" value="org.jboss.unit.*"/>
-
- <!-- Configure defaults & build tools -->
- <call target="configure-defaults"/>
- <call target="configure-tools"/>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Compile |-->
- <!--| |-->
- <!--| This target should depend on other compile-* targets for each |-->
- <!--| different type of compile that needs to be performed, short of |-->
- <!--| documentation compiles. |-->
- <!--+====================================================================+-->
-
- <target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes,
- _default:compile-etc,
- _default:compile-resources">
- <!-- Add module specific elements here. -->
-
- <!-- Workaround to include test classes from maven convention -->
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- source="${javac.source}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${maven.module.test.sources}"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
-
- <include name="${javac.includes}"/>
- </javac>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Generate Output |-->
- <!--| |-->
- <!--| Generates the target output for this module. Target output is |-->
- <!--| the output which is ment to be released or used by external |-->
- <!--| modules. |-->
- <!--+====================================================================+-->
-
- <target name="output"
- description="Generate all target output."
- depends="compile">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/jboss-unit-mc-lib.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/test/**"/>
- </fileset>
- <fileset dir="${maven.module.resources}"/>
- </jar>
-
- <jar jarfile="${build.lib}/jboss-unit-mc-test.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/unit/**"/>
- </fileset>
- <fileset dir="${maven.module.test.resources}"/>
- </jar>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean" depends="_default:clean">
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs" depends="_default:docs">
- <!-- Add module specific elements here. -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
-
- <target name="test" depends="output">
-
- <java classname="org.jboss.test.unit.mc.MCTestLifeCycleTests" fork="true">
-
-
- <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.jdk.JDK14LoggerPlugin"/>
- <sysproperty key="java.util.logging.config.file" value="logging.properties"/>
-
-<!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
--->
- <classpath>
- <path refid="junit.junit.classpath"/>
-
- <path location="${build.lib}/jboss-unit-mc-lib.jar"/>
- <path location="${build.lib}/jboss-unit-mc-test.jar"/>
- <path location="${build.resources}/test"/>
-
- <path refid="jboss.unit.classpath"/>
-
- <path refid="apache.log4j.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss/common.core.classpath"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- <path refid="jboss/common.logging.jdk.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="javassist.javassist.classpath"/>
- <path refid="trove.trove.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="apache.xerces.classpath"/>
-
- </classpath>
- </java>
-
- </target>
-
-</project>
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/pom.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -28,7 +28,8 @@
<modules>
<module>build</module>
<module>unit</module>
- <module>tooling</module>
+ <module>tooling/ant</module>
+ <module>tooling/maven2</module>
<module>mc</module>
<module>remote</module>
<module>test/core</module>
Deleted: modules/test/trunk/remote/build.bat
===================================================================
--- modules/test/trunk/remote/build.bat 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/remote/build.bat 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,54 +0,0 @@
-@echo off
-rem
-rem Invokes a script of the same name in the 'tools' module.
-rem
-rem The 'tools' module is expected to be a peer directory of the directory
-rem in which this script lives.
-rem
-rem @author Jason Dillon <jason(a)planet57.com>
-rem
-
-rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $
-
-setlocal
-
-set PROGNAME=%~nx0
-set DIRNAME=%~dp0
-
-rem Legacy shell support
-if x%PROGNAME%==x set PROGNAME=build.bat
-if x%DIRNAME%==x set DIRNAME=.\
-
-set MODULE_ROOT=%DIRNAME%
-if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
-set TARGET=%TOOLS_ROOT%\bin\build.bat
-set ARGS=%*
-
-rem Start'er up yo
-goto main
-
-:debug
-if not x%DEBUG%==x echo %PROGNAME%: %*
-goto :EOF
-
-:main
-call :debug PROGNAME=%PROGNAME%
-call :debug DIRNAME=%DIRNAME%
-call :debug TOOLS_ROOT=%TOOLS_ROOT%
-call :debug TARGET=%TARGET%
-
-if exist %TARGET% call :call-script & goto :EOF
-rem else fail, we can not go on
-
-echo %PROGNAME%: *ERROR* The target executable does not exist:
-echo %PROGNAME%:
-echo %PROGNAME%: %TARGET%
-echo %PROGNAME%:
-echo %PROGNAME%: Please make sure you have checked out the 'tools' module
-echo %PROGNAME%: and make sure it is up to date.
-goto :EOF
-
-:call-script
-call :debug Executing %TARGET% %ARGS%
-call %TARGET% %ARGS%
-goto :EOF
Deleted: modules/test/trunk/remote/build.sh
===================================================================
--- modules/test/trunk/remote/build.sh 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/remote/build.sh 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,49 +0,0 @@
-#!/bin/sh
-##
-## Invokes a script of the same name in the 'tools' module.
-##
-## The 'tools' module is expected to be a peer directory of the directory
-## in which this script lives.
-##
-## @author Jason Dillon <jason(a)planet57.com>
-##
-
-# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-
-# Buss it yo
-main() {
- if [ "x$TOOLS_ROOT" = "x" ]; then
- TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
- fi
-
- MODULE_ROOT=`cd $DIRNAME; pwd`
- export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
-
- # Where is the target script?
- target="$TOOLS_ROOT/bin/$PROGNAME"
- if [ ! -f "$target" ]; then
- echo "${PROGNAME}: *ERROR* The target executable does not exist:"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: $target"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
- echo "${PROGNAME}: and make sure it is up to date."
- exit 2
- fi
-
- # Get busy yo!
- if [ "x$DEBUG" != "x" ]; then
- echo "${PROGNAME}: Executing: /bin/sh $target $@"
- fi
- if [ "x$TRACE" = "x" ]; then
- exec /bin/sh $target "$@"
- else
- exec /bin/sh -x $target "$@"
- fi
-}
-
-# Lets get ready to rumble!
-main "$@"
Deleted: modules/test/trunk/remote/build.xml
===================================================================
--- modules/test/trunk/remote/build.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/remote/build.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
- ]>
-
-<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ -->
-
-<!--+======================================================================+-->
-<!--| JBoss Portal (The OpenSource Portal) Build File |-->
-<!--| |-->
-<!--| Distributable under LGPL license. |-->
-<!--| See terms of license at http://www.gnu.org. |-->
-<!--| |-->
-<!--| This file has been designed to work with the 'tools' module and |-->
-<!--| Buildmagic extentions. |-->
-<!--+======================================================================+-->
-
-<project default="main" name="JBoss Portal">
-
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
- <!--| Include the common build elements. |-->
- <!--| |-->
- <!--| This defines several different targets, properties and paths. |-->
- <!--| It also sets up the basic extention tasks amoung other things. |-->
- <!--+====================================================================+-->
-
- &buildmagic;
- &modules;
- &defaults;
- &tools;
- &targets;
-
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
-
- <!--+====================================================================+-->
- <!--| Configuration |-->
- <!--| |-->
- <!--| This target is invoked by the Buildmagic initialization logic |-->
- <!--| and should contain module specific configuration elements. |-->
- <!--+====================================================================+-->
-
- <target name="configure" unless="configure.disable">
-
- <!-- Configure thirdparty libraries -->
- &libraries;
- <path id="library.classpath">
- <path refid="junit.junit.classpath"/>
- <path refid="jboss.portal/modules/common.classpath"/>
-
- <path refid="apache.log4j.classpath"/>
-
- <path refid="apache.httpclient.classpath"/>
- <path refid="apache.codec.classpath"/>
- <path refid="apache.logging.classpath"/>
-
- <path refid="jboss/common.core.classpath"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- </path>
-
- <!-- Configure modules -->
- <call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <path refid="portal.test.classpath"/>
- <path refid="jboss.unit.classpath"/>
- </path>
-
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
-
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
- <property name="javadoc.private" value="false"/>
- <property name="javadoc.protected" value="false"/>
- <property name="javadoc.packages" value="org.jboss.unit.*"/>
-
- <!-- Configure defaults & build tools -->
- <call target="configure-defaults"/>
- <call target="configure-tools"/>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Compile |-->
- <!--| |-->
- <!--| This target should depend on other compile-* targets for each |-->
- <!--| different type of compile that needs to be performed, short of |-->
- <!--| documentation compiles. |-->
- <!--+====================================================================+-->
-
- <target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes,
- _default:compile-etc,
- _default:compile-resources">
- <!-- Add module specific elements here. -->
-
- <!-- Workaround to include test classes from maven convention -->
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- source="${javac.source}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${maven.module.test.sources}"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
-
- <include name="${javac.includes}"/>
- </javac>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Generate Output |-->
- <!--| |-->
- <!--| Generates the target output for this module. Target output is |-->
- <!--| the output which is ment to be released or used by external |-->
- <!--| modules. |-->
- <!--+====================================================================+-->
-
- <target name="output"
- description="Generate all target output."
- depends="compile">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/jboss-unit-remote-lib.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/test/**"/>
- </fileset>
- <fileset dir="${maven.module.resources}"/>
- </jar>
-
- <jar jarfile="${build.lib}/jboss-unit-remote-test.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/unit/**"/>
- </fileset>
- <fileset dir="${maven.module.test.resources}"/>
- </jar>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean" depends="_default:clean">
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs" depends="_default:docs">
- <!-- Add module specific elements here. -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
-
- <target name="test" depends="output">
-
- <java classname="org.jboss.test.unit.AllTests" fork="true">
-<!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
--->
- <classpath>
- <path refid="junit.junit.classpath"/>
- <path location="${build.lib}/jboss-unit-lib.jar"/>
- <path location="${build.lib}/jboss-unit-test.jar"/>
- <path location="${build.resources}/test"/>
-
- <path location="${build.lib}/jboss-unit-remote-test.jar"/>
- </classpath>
- </java>
-
- </target>
-
-</project>
Deleted: modules/test/trunk/test/build.bat
===================================================================
--- modules/test/trunk/test/build.bat 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/test/build.bat 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,54 +0,0 @@
-@echo off
-rem
-rem Invokes a script of the same name in the 'tools' module.
-rem
-rem The 'tools' module is expected to be a peer directory of the directory
-rem in which this script lives.
-rem
-rem @author Jason Dillon <jason(a)planet57.com>
-rem
-
-rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $
-
-setlocal
-
-set PROGNAME=%~nx0
-set DIRNAME=%~dp0
-
-rem Legacy shell support
-if x%PROGNAME%==x set PROGNAME=build.bat
-if x%DIRNAME%==x set DIRNAME=.\
-
-set MODULE_ROOT=%DIRNAME%
-if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
-set TARGET=%TOOLS_ROOT%\bin\build.bat
-set ARGS=%*
-
-rem Start'er up yo
-goto main
-
-:debug
-if not x%DEBUG%==x echo %PROGNAME%: %*
-goto :EOF
-
-:main
-call :debug PROGNAME=%PROGNAME%
-call :debug DIRNAME=%DIRNAME%
-call :debug TOOLS_ROOT=%TOOLS_ROOT%
-call :debug TARGET=%TARGET%
-
-if exist %TARGET% call :call-script & goto :EOF
-rem else fail, we can not go on
-
-echo %PROGNAME%: *ERROR* The target executable does not exist:
-echo %PROGNAME%:
-echo %PROGNAME%: %TARGET%
-echo %PROGNAME%:
-echo %PROGNAME%: Please make sure you have checked out the 'tools' module
-echo %PROGNAME%: and make sure it is up to date.
-goto :EOF
-
-:call-script
-call :debug Executing %TARGET% %ARGS%
-call %TARGET% %ARGS%
-goto :EOF
Deleted: modules/test/trunk/test/build.sh
===================================================================
--- modules/test/trunk/test/build.sh 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/test/build.sh 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,49 +0,0 @@
-#!/bin/sh
-##
-## Invokes a script of the same name in the 'tools' module.
-##
-## The 'tools' module is expected to be a peer directory of the directory
-## in which this script lives.
-##
-## @author Jason Dillon <jason(a)planet57.com>
-##
-
-# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-
-# Buss it yo
-main() {
- if [ "x$TOOLS_ROOT" = "x" ]; then
- TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
- fi
-
- MODULE_ROOT=`cd $DIRNAME; pwd`
- export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
-
- # Where is the target script?
- target="$TOOLS_ROOT/bin/$PROGNAME"
- if [ ! -f "$target" ]; then
- echo "${PROGNAME}: *ERROR* The target executable does not exist:"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: $target"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
- echo "${PROGNAME}: and make sure it is up to date."
- exit 2
- fi
-
- # Get busy yo!
- if [ "x$DEBUG" != "x" ]; then
- echo "${PROGNAME}: Executing: /bin/sh $target $@"
- fi
- if [ "x$TRACE" = "x" ]; then
- exec /bin/sh $target "$@"
- else
- exec /bin/sh -x $target "$@"
- fi
-}
-
-# Lets get ready to rumble!
-main "$@"
Deleted: modules/test/trunk/test/build.xml
===================================================================
--- modules/test/trunk/test/build.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/test/build.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
- ]>
-
-<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ -->
-
-<!--+======================================================================+-->
-<!--| JBoss Portal (The OpenSource Portal) Build File |-->
-<!--| |-->
-<!--| Distributable under LGPL license. |-->
-<!--| See terms of license at http://www.gnu.org. |-->
-<!--| |-->
-<!--| This file has been designed to work with the 'tools' module and |-->
-<!--| Buildmagic extentions. |-->
-<!--+======================================================================+-->
-
-<project default="main" name="JBoss Portal">
-
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
- <!--| Include the common build elements. |-->
- <!--| |-->
- <!--| This defines several different targets, properties and paths. |-->
- <!--| It also sets up the basic extention tasks amoung other things. |-->
- <!--+====================================================================+-->
-
- &buildmagic;
- &modules;
- &defaults;
- &tools;
- &targets;
-
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
-
- <!--+====================================================================+-->
- <!--| Configuration |-->
- <!--| |-->
- <!--| This target is invoked by the Buildmagic initialization logic |-->
- <!--| and should contain module specific configuration elements. |-->
- <!--+====================================================================+-->
-
- <target name="configure" unless="configure.disable">
-
- <property name="javac.excludes" value="org/jboss/portal/test/framework/runner/**"/>
-
- <!-- Configure thirdparty libraries -->
- &libraries;
- <path id="library.classpath">
- <path refid="jboss.portal/modules/common.classpath"/>
-
- <!-- For embedded services -->
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
- <path refid="hibernate.hibernate.classpath"/>
- <path refid="sun.opends.classpath"/>
-
- <path refid="oswego.concurrent.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="sun.servlet.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="codehaus.cargo.classpath"/>
-
- </path>
-
- <!-- Configure modules -->
- <call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- </path>
-
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
-
- <!-- Configure defaults & build tools -->
- <call target="configure-defaults"/>
- <call target="configure-tools"/>
-
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
- <property name="javadoc.private" value="true"/>
- <property name="javadoc.protected" value="false"/>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Compile |-->
- <!--| |-->
- <!--| This target should depend on other compile-* targets for each |-->
- <!--| different type of compile that needs to be performed, short of |-->
- <!--| documentation compiles. |-->
- <!--+====================================================================+-->
-
- <target name="compile"
- description="Compile all source files."
- depends="compile-classes,
- _default:compile-etc,
- _default:compile-resources">
- <!-- Add module specific elements here. -->
- </target>
-
- <target name="compile-classes" depends="_buildmagic:init">
- <mkdir dir="${build.classes}"/>
-
- <!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen.classes}"/>
-
- <!-- Remove classes which depend on changed files, so they will rebuild. -->
- <depend srcdir="${source.java}:${build.gen.classes}"
- destdir="${build.classes}"
- dump="${javac.depend.dump}"
- closure="${javac.depend.closure}">
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </depend>
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- source="${javac.source}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${maven.module.source}:${build.gen.classes}"/>
- <classpath refid="javac.classpath"/>
-
- <include name="${javac.includes}"/>
- <exclude name="${javac.excludes}"/>
- </javac>
-
-
- <!--Process manifest file-->
- <copy todir="${build.resources}" filtering="yes">
- <fileset dir="./core/resources">
- <include name="**/*.mf"/>
- <patternset refid="compile-resources.filter.pattern"/>
- </fileset>
- </copy>
-
- </target>
-
-
- <!--+====================================================================+-->
- <!--| Generate Output |-->
- <!--| |-->
- <!--| Generates the target output for this module. Target output is |-->
- <!--| the output which is ment to be released or used by external |-->
- <!--| modules. |-->
- <!--+====================================================================+-->
-
- <target name="output"
- description="Generate all target output."
- depends="compile">
-
- <mkdir dir="${build.lib}"/>
-
- <!-- -->
- <jar jarfile="${build.lib}/portal-test-lib.jar" manifest="${build.resources}/META-INF/portal-test-lib-jar.mf">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/portal/test/framework/impl/**"/>
- <exclude name="org/jboss/test/**"/>
- </fileset>
- </jar>
-
- <!-- -->
- <jar jarfile="${build.lib}/portal-test-jboss-lib.jar" manifest="${build.resources}/META-INF/portal-test-lib-jar.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/framework/impl/jboss/**"/>
- <include name="org/jboss/portal/test/framework/embedded/opends/**"/>
- </fileset>
- <fileset dir="./jboss/resources"/>
- </jar>
-
- <!-- -->
- <jar jarfile="${build.lib}/portal-test-generic-lib.jar" manifest="${build.resources}/META-INF/portal-test-lib-jar.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/framework/impl/generic/**"/>
- </fileset>
- <fileset dir="./generic/resources"/>
- </jar>
-
- <!-- -->
- <jar jarfile="${build.lib}/portal-test-agent.sar">
- <fileset dir="./agent/resources"/>
- <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-test-jboss-lib.jar"/>
- </jar>
-
- <!-- What we put in the repository -->
- <mkdir dir="${module.output}/export"/>
- <mkdir dir="${module.output}/export/lib"/>
- <mkdir dir="${module.output}/export/resources"/>
- <copy todir="${module.output}/export/lib">
- <fileset dir="${build.lib}"/>
- </copy>
- <zip file="${module.output}/export/lib/opends.zip">
- <fileset dir="./core/resources/config/opends"/>
- </zip>
- <copy todir="${module.output}/export/resources">
- <fileset dir="./core/resources/config" includes="*.xml"/>
- </copy>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean" depends="_default:clean">
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs" depends="_default:docs">
- <!-- Add module specific elements here. -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <target name="deploy"
- description="Deploy."
- depends="output">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="${build.lib}/portal-test.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
- </target>
-
- <target name="undeploy"
- description="Undeploy."
- depends="init">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-test.sar"/>
- </target>
-
- <!-- ============================= -->
- <!-- Paths etc. for the retro task -->
- <!-- ============================= -->
-
-
-<!--
- <test todir="${test.reports}" name="org.jboss.portal.test.common.test.junit.POJOJunitTestTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.common.test.InfoTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParameterValueTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParametrizationTestCase"/>
--->
-
- <!-- Run jbossretro on the classes -->
- <!--<target name="retro" depends="_default:most">-->
-
- <!--<property name="build.lib.retro" value="${module.output}/lib14"/>-->
- <!--<path id="jbossretro.classpath">-->
- <!--<path refid="apache.ant.classpath"/>-->
- <!--<path refid="jboss.jbossretro.classpath"/>-->
- <!--<path refid="jboss/backport.concurrent.classpath"/>-->
- <!--<path refid="javassist.classpath"/>-->
- <!--</path>-->
-
- <!--<taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>-->
-
- <!--<mkdir dir="selenium-java-client-driver"/>-->
- <!--<mkdir dir="selenium-java-client-driver-backport"/>-->
- <!--<unzip src="selenium-java-client-driver.jar" dest="selenium-java-client-driver"/>-->
- <!--<retro compilerclasspathref="jbossretro.classpath" destdir="selenium-java-client-driver-backport">-->
- <!--<classpath refid="jbossretro.classpath"/>-->
- <!--<classpath refid="library.classpath"/>-->
- <!--<classpath refid="dependentmodule.classpath"/>-->
- <!--<classpath>-->
- <!--<pathelement location="selenium-java-client-driver"/>-->
- <!--</classpath>-->
- <!--<src path="selenium-java-client-driver"/>-->
- <!--</retro>-->
- <!--<jar destfile="selenium-java-client-driver-backport.jar">-->
- <!--<fileset dir="selenium-java-client-driver-backport"/>-->
- <!--</jar>-->
-
- <!--</target>-->
-
- <target name="package-tests">
- </target>
-
-</project>
Modified: modules/test/trunk/tooling/ant/pom.xml
===================================================================
--- modules/test/trunk/tooling/ant/pom.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/tooling/ant/pom.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -24,13 +24,19 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling</artifactId>
- </dependency>
</dependencies>
- <properties>
-
- </properties>
-</project>
\ No newline at end of file
+ <build>
+ <sourceDirectory>../src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/unit/tooling/maven2/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: modules/test/trunk/tooling/build.bat
===================================================================
--- modules/test/trunk/tooling/build.bat 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/tooling/build.bat 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,54 +0,0 @@
-@echo off
-rem
-rem Invokes a script of the same name in the 'tools' module.
-rem
-rem The 'tools' module is expected to be a peer directory of the directory
-rem in which this script lives.
-rem
-rem @author Jason Dillon <jason(a)planet57.com>
-rem
-
-rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $
-
-setlocal
-
-set PROGNAME=%~nx0
-set DIRNAME=%~dp0
-
-rem Legacy shell support
-if x%PROGNAME%==x set PROGNAME=build.bat
-if x%DIRNAME%==x set DIRNAME=.\
-
-set MODULE_ROOT=%DIRNAME%
-if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
-set TARGET=%TOOLS_ROOT%\bin\build.bat
-set ARGS=%*
-
-rem Start'er up yo
-goto main
-
-:debug
-if not x%DEBUG%==x echo %PROGNAME%: %*
-goto :EOF
-
-:main
-call :debug PROGNAME=%PROGNAME%
-call :debug DIRNAME=%DIRNAME%
-call :debug TOOLS_ROOT=%TOOLS_ROOT%
-call :debug TARGET=%TARGET%
-
-if exist %TARGET% call :call-script & goto :EOF
-rem else fail, we can not go on
-
-echo %PROGNAME%: *ERROR* The target executable does not exist:
-echo %PROGNAME%:
-echo %PROGNAME%: %TARGET%
-echo %PROGNAME%:
-echo %PROGNAME%: Please make sure you have checked out the 'tools' module
-echo %PROGNAME%: and make sure it is up to date.
-goto :EOF
-
-:call-script
-call :debug Executing %TARGET% %ARGS%
-call %TARGET% %ARGS%
-goto :EOF
Deleted: modules/test/trunk/tooling/build.sh
===================================================================
--- modules/test/trunk/tooling/build.sh 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/tooling/build.sh 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,49 +0,0 @@
-#!/bin/sh
-##
-## Invokes a script of the same name in the 'tools' module.
-##
-## The 'tools' module is expected to be a peer directory of the directory
-## in which this script lives.
-##
-## @author Jason Dillon <jason(a)planet57.com>
-##
-
-# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-
-# Buss it yo
-main() {
- if [ "x$TOOLS_ROOT" = "x" ]; then
- TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
- fi
-
- MODULE_ROOT=`cd $DIRNAME; pwd`
- export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
-
- # Where is the target script?
- target="$TOOLS_ROOT/bin/$PROGNAME"
- if [ ! -f "$target" ]; then
- echo "${PROGNAME}: *ERROR* The target executable does not exist:"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: $target"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
- echo "${PROGNAME}: and make sure it is up to date."
- exit 2
- fi
-
- # Get busy yo!
- if [ "x$DEBUG" != "x" ]; then
- echo "${PROGNAME}: Executing: /bin/sh $target $@"
- fi
- if [ "x$TRACE" = "x" ]; then
- exec /bin/sh $target "$@"
- else
- exec /bin/sh -x $target "$@"
- fi
-}
-
-# Lets get ready to rumble!
-main "$@"
Deleted: modules/test/trunk/tooling/build.xml
===================================================================
--- modules/test/trunk/tooling/build.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/tooling/build.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
- ]>
-
-<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ -->
-
-<!--+======================================================================+-->
-<!--| JBoss Portal (The OpenSource Portal) Build File |-->
-<!--| |-->
-<!--| Distributable under LGPL license. |-->
-<!--| See terms of license at http://www.gnu.org. |-->
-<!--| |-->
-<!--| This file has been designed to work with the 'tools' module and |-->
-<!--| Buildmagic extentions. |-->
-<!--+======================================================================+-->
-
-<project default="main" name="JBoss Portal">
-
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
- <!--| Include the common build elements. |-->
- <!--| |-->
- <!--| This defines several different targets, properties and paths. |-->
- <!--| It also sets up the basic extention tasks amoung other things. |-->
- <!--+====================================================================+-->
-
- &buildmagic;
- &modules;
- &defaults;
- &tools;
- &targets;
-
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
-
- <!--+====================================================================+-->
- <!--| Configuration |-->
- <!--| |-->
- <!--| This target is invoked by the Buildmagic initialization logic |-->
- <!--| and should contain module specific configuration elements. |-->
- <!--+====================================================================+-->
-
- <target name="configure" unless="configure.disable">
-
- <!-- Configure thirdparty libraries -->
- &libraries;
- <path id="library.classpath">
- <path location="../tools/lib/ant-junit.jar"/>
- <path location="${apache.ant.lib}/ant.jar"/>
- <path location="${project.root}/unit/"/>
- </path>
-
- <!-- Configure modules -->
- <call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <path refid="jboss.unit.classpath"/>
- </path>
-
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
-
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
- <property name="javadoc.private" value="false"/>
- <property name="javadoc.protected" value="false"/>
- <property name="javadoc.packages" value="org.jboss.unit.*"/>
-
- <!-- Configure defaults & build tools -->
- <call target="configure-defaults"/>
- <call target="configure-tools"/>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Compile |-->
- <!--| |-->
- <!--| This target should depend on other compile-* targets for each |-->
- <!--| different type of compile that needs to be performed, short of |-->
- <!--| documentation compiles. |-->
- <!--+====================================================================+-->
-
- <target name="compile"
- description="Compile all source files."
- depends="_buildmagic:init,configure-defaults"
- >
-
- <!--depends="_default:compile-classes,
- _default:compile-etc,
- _default:compile-resources"-->
-
- <!-- Add module specific elements here. -->
-
-
- <!-- Workaround to include stuff from maven convention -->
-
- <!--<property name="build.classes" value="./output/classes"/>-->
- <mkdir dir="${build.classes}"/>
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- source="${javac.source}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="./core/src/main/java"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
-
- <include name="${javac.includes}"/>
- </javac>
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- source="${javac.source}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="./ant/src/main/java"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
-
- <include name="${javac.includes}"/>
- </javac>
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- source="${javac.source}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="./ant/src/test/java"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
-
- <include name="${javac.includes}"/>
- </javac>
-
-
- <!--<mkdir dir="${build.resources}"/>-->
- <!--<copy todir="${build.resources}" filtering="yes">-->
- <!--<fileset dir="./ant/src/test/resources">-->
- <!--<patternset refid="compile-resources.filter.pattern"/>-->
- <!--</fileset>-->
- <!--</copy>-->
- <!--<copy todir="${build.resources}" filtering="no">-->
- <!--<fileset dir="./ant/src/test/resources">-->
- <!--<patternset refid="compile-resources.pattern"/>-->
- <!--</fileset>-->
- <!--</copy>-->
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Generate Output |-->
- <!--| |-->
- <!--| Generates the target output for this module. Target output is |-->
- <!--| the output which is ment to be released or used by external |-->
- <!--| modules. |-->
- <!--+====================================================================+-->
-
- <target name="output"
- description="Generate all target output."
- depends="compile">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/jboss-unit-tooling-lib.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/test/**"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/jboss-unit-tooling-test.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/unit/**"/>
- </fileset>
- <fileset dir="./ant/src/test/resources"/>
- </jar>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean" depends="_default:clean">
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs" depends="_default:docs">
- <!-- Add module specific elements here. -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
-
- <!--<target name="test" depends="output">
-
- <java classname="org.jboss.test.unit.AllTests" fork="true">
---><!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
---><!--
- <classpath>
- <path location="${build.lib}/jboss-unit-lib.jar"/>
- <path location="${build.lib}/jboss-unit-test.jar"/>
- <path location="${build.resources}/test"/>
- </classpath>
- </java>
-
- </target>-->
-
- <target name="tests-ant" depends="output" >
- <path id="jboss.unit.tooling.test.classpath">
- <pathelement location="${build.lib}/jboss-unit-tooling-lib.jar"/>
- <pathelement location="${build.lib}/jboss-unit-tooling-test.jar"/>
- <path refid="dependentmodule.classpath"/>
- </path>
- <taskdef
- name="jboss-unit"
- classname="org.jboss.unit.tooling.ant.JBossUnitTask"
- classpathref="jboss.unit.tooling.test.classpath"/>
-
-
- <jboss-unit>
-
-
- <tests config="./ant/src/test/resources/simple-tests.xml" suiteName="one">
- <!-- no include tag means invoke all -->
- <!-- but you can still exclude some tests -->
- <property name="propName" value="propValue"/>
-
- <parameter name="param1">
- <value>one</value>
- <value>two</value>
- <value>three</value>
- </parameter>
-
- <parameter name="param2">
- <value>2one</value>
- <value>2two</value>
- <value>2three</value>
- </parameter>
-
- <exclude id="otherTestTwo"/>
- </tests>
-
- <tests config="./ant/src/test/resources/assertkeyword-unit.xml">
- </tests>
-
- <!--<tests config="./output/resources/test/simple-tests.xml">
- <include id="testOne"/>
- <include id="otherTestOne"/>
- <exclude ids="testOne,testTwo"/>
- </tests>
-
- <tests config="output/resources/test/simple-tests.xml" suiteName="three">
- <include id="otherTestOne"/>
- <include id="testOne"/>
- <include id="otherTestTwo"/>
- </tests>
-
- <tests config="output/resources/test/simple-tests.xml" suiteName="four">
- <include keywords="simpleTag"/>
- </tests>-->
-
-
- <!--<tests config="output/resources/test/simple-tests.xml">-->
- <!-- this one should fail as attribute 'id' is exclusive -->
- <!--<include id="otherTestOne" ids="testOne,testTwo" keywords="lola,lolo,loli"/>-->
- <!--</tests>-->
-
- <!-- provide noConsole="true" to disable console output -->
- <reports>
- <!-- if toDir for xml reports doesn't exist it'll be created -->
- <!-- at the moment it produces xmls in junit format -->
- <xml toDir="./output/test-results/xml"/>
-
- <!-- html reports uses junit reporting task and will reuse reports generated by <xml> task-->
- <html toDir="./output/test-results/html"/>
- </reports>
-
- <sysproperty key="toto" value="totoValue"/>
- <sysproperty key="nono" value="nonoValue"/>
-
- <classpath>
-
- <path location="${build.lib}/jboss-unit-tooling-lib.jar"/>
- <path location="${build.lib}/jboss-unit-tooling-test.jar"/>
- <path refid="dependentmodule.classpath"/>
-
- </classpath>
-
-
- </jboss-unit >
-
-
-
- </target>
-
-</project>
Modified: modules/test/trunk/tooling/maven2/pom.xml
===================================================================
--- modules/test/trunk/tooling/maven2/pom.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/tooling/maven2/pom.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -40,13 +40,21 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-unit-tooling</artifactId>
- </dependency>
</dependencies>
- <properties/>
+ <build>
+ <sourceDirectory>../src/main/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/unit/tooling/ant/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: modules/test/trunk/tooling/pom.xml
===================================================================
--- modules/test/trunk/tooling/pom.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/tooling/pom.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -14,7 +14,6 @@
<name>JBoss Unit Tooling (aggregator)</name>
<version>1.1.0-SNAPSHOT</version>
<modules>
- <module>core</module>
<module>ant</module>
<module>maven2</module>
</modules>
Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java (from rev 8938, modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/JavaBuilder.java)
===================================================================
--- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java (rev 0)
+++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/JavaBuilder.java 2007-11-15 10:56:16 UTC (rev 8939)
@@ -0,0 +1,762 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.unit.tooling;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Assertions;
+import org.apache.tools.ant.taskdefs.Java;
+import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PROPERTIES;
+import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PROPERTY;
+import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PARAMETERS;
+import static org.jboss.unit.tooling.ToolingConstants.JBOSS_UNIT_PARAMETER;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.LinkedList;
+
+import static org.jboss.unit.tooling.ToolingConstants.*;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class JavaBuilder
+{
+
+ private Project antProject;
+
+ private String config;
+
+ private String suiteName;
+
+ private Set<String> includeIDs = new HashSet<String>();
+
+ private Set<String> includeKeywords = new HashSet<String>();
+
+ private Set<String> excludeIDs = new HashSet<String>();
+
+ private Set<String> excludeKeywords = new HashSet<String>();
+
+ private boolean jPDA = false;
+
+ private boolean fork = true;
+
+ private String xmlReportDir;
+
+ private String htmlReportDir;
+
+ private Map<String,String> properties = new HashMap<String,String>();
+
+ private Map<String,List<String>> parameters = new HashMap<String, List<String>>();
+
+ public JavaBuilder()
+ {
+ init();
+ }
+
+ public JavaBuilder(Project antProject)
+ {
+ this.antProject = antProject;
+ init();
+ }
+
+ private void init()
+ {
+ if (antProject == null)
+ {
+ antProject = new Project();
+ antProject.init();
+ }
+ }
+
+ public Java buildJava()
+ {
+ Java java = (Java)antProject.createTask("java");
+
+ java.setClassname("org.jboss.unit.tooling.Main");
+
+ // Set jboss logging to use JUL
+ Environment.Variable pluginProperty = new Environment.Variable();
+ pluginProperty.setKey("org.jboss.logging.Logger.pluginClass");
+ pluginProperty.setValue("org.jboss.logging.jdk.JDK14LoggerPlugin");
+ java.addSysproperty(pluginProperty);
+
+ // Set JUL to configure using the logging.properties file found in the current dir
+ Environment.Variable julProperty = new Environment.Variable();
+ julProperty.setKey("java.util.logging.config.file");
+ julProperty.setValue("logging.properties");
+ java.addSysproperty(julProperty);
+
+ // We enable by default all assertions : todo make it configurable perhaps (see JDK doc about assertions)
+ Assertions assertions = new Assertions();
+ assertions.setProject(antProject);
+ assertions.addEnable(new Assertions.EnabledAssertion());
+ java.addAssertions(assertions);
+
+ // Beginning of jpda option implementation, need to improve it
+ if (jPDA)
+ {
+ Environment.Variable javaDotCompilerProperty = new Environment.Variable();
+ javaDotCompilerProperty.setKey("java.compiler");
+ javaDotCompilerProperty.setValue("NONE");
+ java.addSysproperty(javaDotCompilerProperty);
+ java.setJvmargs("-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000");
+ }
+
+ // Set fork
+ if (isFork())
+ {
+ java.setFork(true);
+ }
+
+
+ java.createArg().setValue(OPT_CONFIG + "=" + config);
+
+ if (getSuiteName() != null)
+ {
+ java.createArg().setValue(OPT_SUITE_NAME + "=" + getSuiteName());
+ }
+
+ if (getXmlReportDir() != null)
+ {
+ java.createArg().setValue(OPT_XML_REPORT_DIR + "=" + getXmlReportDir());
+ }
+
+ if (getHtmlReportDir() != null)
+ {
+ java.createArg().setValue(OPT_HTML_REPORT_DIR + "=" + getHtmlReportDir());
+ }
+
+ if (includeIDs.size() != 0)
+ {
+ java.createArg().setValue(generateArgument(includeIDs, OPT_IDS));
+ }
+
+ if (includeKeywords.size() != 0)
+ {
+ java.createArg().setValue(generateArgument(includeKeywords, OPT_KEYWORDS));
+ }
+
+ if (excludeIDs.size() != 0)
+ {
+ java.createArg().setValue(generateArgument(excludeIDs, OPT_EX_IDS));
+ }
+
+ if (excludeKeywords.size() != 0)
+ {
+ java.createArg().setValue(generateArgument(excludeKeywords, OPT_EX_KEYWORDS));
+ }
+
+
+ if (properties.size() > 0)
+ {
+
+ StringBuilder props = new StringBuilder("[");
+
+ for (Iterator<String> iterator = properties.keySet().iterator(); iterator.hasNext();)
+ {
+ String propertyKey = iterator.next();
+
+ String propertyValue = properties.get(propertyKey);
+
+ props.append(propertyKey + "=" + propertyValue);
+
+ if (iterator.hasNext())
+ {
+ props.append(",");
+ }
+ else
+ {
+ props.append("]");
+ }
+ }
+
+ java.createArg().setValue(OPT_PROPERTIES + "=" + props);
+
+ }
+
+
+ if (!parameters.isEmpty())
+ {
+ StringBuilder params = new StringBuilder("[");
+
+ Set<String> paramNames = parameters.keySet();
+
+ for (Iterator<String> stringIterator = paramNames.iterator(); stringIterator.hasNext();)
+ {
+ String name = stringIterator.next();
+
+
+ List<String> paramValues = parameters.get(name);
+
+ for (Iterator<String> iterator = paramValues.iterator(); iterator.hasNext();)
+ {
+ String value = iterator.next();
+
+
+ params.append(name)
+ .append("=")
+ .append(value);
+
+ if (iterator.hasNext())
+ {
+ params.append(",");
+ }
+ }
+
+ if (stringIterator.hasNext())
+ {
+ params.append(",");
+ }
+ else
+ {
+ params.append("]");
+ }
+
+ }
+
+ java.createArg().setValue(OPT_PARAMETERS + "=" + params);
+
+ }
+
+
+
+ return java;
+ }
+
+
+
+ public String getConfig()
+ {
+ return config;
+ }
+
+ public void setConfig(String config)
+ {
+ if (config == null)
+ {
+ throw new IllegalArgumentException("config cannot be null");
+ }
+ this.config = config;
+ }
+
+ public String getSuiteName()
+ {
+ return suiteName;
+ }
+
+ public void setSuiteName(String suiteName)
+ {
+ if (suiteName == null)
+ {
+ throw new IllegalArgumentException("suiteName cannot be null");
+ }
+ this.suiteName = suiteName;
+ }
+
+ public void addIncludeID(String id)
+ {
+ if (id == null)
+ {
+ throw new IllegalArgumentException("id cannot be null");
+ }
+
+ includeIDs.add(id);
+ }
+
+ public void addUnparsedIncludeIDs(String ids)
+ {
+ if (ids == null)
+ {
+ throw new IllegalArgumentException("ids cannot be null");
+ }
+
+ addUnparsedString(getIncludeIDs(), ids);
+ }
+
+ public Set<String> getIncludeIDs()
+ {
+ return includeIDs;
+ }
+
+ public void setIncludeIDs(Set<String> includeIDs)
+ {
+ if (includeIDs == null)
+ {
+ throw new IllegalArgumentException("includeIDs cannot be null");
+ }
+
+ this.includeIDs = includeIDs;
+ }
+
+ public void addIncludeKeyword(String keyword)
+ {
+ if (keyword == null)
+ {
+ throw new IllegalArgumentException("keyword cannot be null");
+ }
+
+ includeKeywords.add(keyword);
+ }
+
+
+ public void addUnparsedIncludeKeywords(String keywords)
+ {
+ if (keywords == null)
+ {
+ throw new IllegalArgumentException("keywords cannot be null");
+ }
+
+ addUnparsedString(getIncludeKeywords(), keywords);
+ }
+
+ public Set<String> getIncludeKeywords()
+ {
+ return includeKeywords;
+ }
+
+ public void setIncludeKeywords(Set<String> includeKeywords)
+ {
+ if ( includeKeywords == null)
+ {
+ throw new IllegalArgumentException("includeKeywords cannot be null");
+ }
+
+ this.includeKeywords = includeKeywords;
+ }
+
+ public void addExcludeID(String id)
+ {
+ if (id == null)
+ {
+ throw new IllegalArgumentException("id cannot be null");
+ }
+
+ excludeIDs.add(id);
+ }
+
+ public void addUnparsedExcludeIDs(String ids)
+ {
+ if (ids == null)
+ {
+ throw new IllegalArgumentException("ids cannot be null");
+ }
+
+ addUnparsedString(getExcludeIDs(), ids);
+ }
+
+ public Set<String> getExcludeIDs()
+ {
+ return excludeIDs;
+ }
+
+ public void setExcludeIDs(Set<String> excludeIDs)
+ {
+ if (excludeIDs == null)
+ {
+ throw new IllegalArgumentException("excludeIDs cannot be null");
+ }
+
+ this.excludeIDs = excludeIDs;
+ }
+
+ public void addExcludeKeyword(String keyword)
+ {
+ if (keyword == null)
+ {
+ throw new IllegalArgumentException("keyword cannot be null");
+ }
+
+ excludeKeywords.add(keyword);
+ }
+
+ public void addUnparsedExcludeKeywords(String keywords)
+ {
+ if (keywords == null)
+ {
+ throw new IllegalArgumentException("keywords cannot be null");
+ }
+
+ addUnparsedString(getExcludeKeywords(), keywords);
+ }
+
+ public Set<String> getExcludeKeywords()
+ {
+ return excludeKeywords;
+ }
+
+ public void setExcludeKeywords(Set<String> excludeKeywords)
+ {
+ if (excludeKeywords == null)
+ {
+ throw new IllegalArgumentException("excludeKeywords cannot be null");
+ }
+
+ this.excludeKeywords = excludeKeywords;
+ }
+
+ public boolean isJPDA()
+ {
+ return jPDA;
+ }
+
+ public void setJPDA(boolean jPDA)
+ {
+ this.jPDA = jPDA;
+ }
+
+ public boolean isFork()
+ {
+ return fork;
+ }
+
+ public void setFork(boolean fork)
+ {
+ this.fork = fork;
+ }
+
+ private void addUnparsedString(Set<String> set, String valueString)
+ {
+ if (valueString == null)
+ {
+ throw new IllegalArgumentException("valueString cannot be null");
+ }
+ String[] parsedValues = valueString.split(",");
+ for (String keyword : parsedValues)
+ {
+ set.add(keyword.trim());
+ }
+ }
+
+
+ public String getXmlReportDir()
+ {
+ return xmlReportDir;
+ }
+
+ public void setXmlReportDir(String xmlReportDir)
+ {
+ this.xmlReportDir = xmlReportDir;
+ }
+
+ public String getHtmlReportDir()
+ {
+ return htmlReportDir;
+ }
+
+ public void setHtmlReportDir(String htmlReportDir)
+ {
+ this.htmlReportDir = htmlReportDir;
+ }
+
+ public Project getAntProject()
+ {
+ return antProject;
+ }
+
+ public void setAntProject(Project antProject)
+ {
+ this.antProject = antProject;
+ }
+
+ public Map<String, String> getProperties()
+ {
+ return properties;
+ }
+
+ public void setProperties(Map<String, String> properties)
+ {
+ this.properties = properties;
+ }
+
+ public void addProperties(Map<String,String> toAdd)
+ {
+ if (toAdd == null)
+ {
+ throw new IllegalArgumentException("property map cannot be null");
+ }
+
+ properties.putAll(toAdd);
+ }
+
+
+ public void addProperty(String key, String value)
+ {
+ if (key == null || value == null)
+ {
+ throw new IllegalArgumentException("Key and value must not be null");
+ }
+
+ properties.put(key, value);
+ }
+
+ public void updateFQNProperties(Map toUpdate)
+ {
+
+ String sysProperties = (String)toUpdate.get(JBOSS_UNIT_PROPERTIES);
+
+ if (sysProperties != null && sysProperties.length() > 0)
+ {
+
+ Map<String,String> parsedProps = JavaBuilder.parseProperties(sysProperties);
+
+ properties.putAll(parsedProps);
+ }
+
+ for (Object sysPropKey : toUpdate.keySet())
+ {
+
+ if (sysPropKey.toString().startsWith(JBOSS_UNIT_PROPERTY))
+ {
+ String propertyString = sysPropKey + "=" + toUpdate.get(sysPropKey);
+
+ propertyString = propertyString.replaceFirst(JBOSS_UNIT_PROPERTY + "\\.", "");
+
+ //
+ String[] patternValues = propertyString.split("=");
+
+ //
+ if (patternValues.length != 2)
+ {
+ throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString);
+ }
+
+ properties.put(patternValues[0],patternValues[1]);
+
+ }
+
+
+ }
+
+ }
+
+ public static Map<String,String> parseProperties(String propertiesString)
+ {
+ if (!propertiesString.matches("\\[.+=.+(,.+=.+)*\\]"))
+ {
+ throw new IllegalArgumentException("Properties don't follow proper format: [a=b,c=d,e=f]");
+ }
+
+ Map<String,String> parsedProps = new HashMap<String,String>();
+
+ propertiesString = propertiesString.replaceAll("\\[","").replaceAll("\\]","");
+
+ String propertyGroups[] = propertiesString.split(",");
+
+ for (String propertyGroup : propertyGroups)
+ {
+
+ String property[] = propertyGroup.split("=");
+
+ //
+ if (property.length != 2)
+ {
+ throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + property);
+ }
+
+ parsedProps.put(property[0],property[1]);
+ }
+ return parsedProps;
+ }
+
+ public Map<String, List<String>> getParameters()
+ {
+ return parameters;
+ }
+
+ public void setParameters(Map<String, List<String>> parameters)
+ {
+ this.parameters = parameters;
+ }
+
+
+ public void addParameters(Map<String, List<String>> toAdd)
+ {
+
+ if (toAdd == null)
+ {
+ throw new IllegalArgumentException("parameter map cannot be null");
+ }
+
+ parameters.putAll(toAdd);
+
+ }
+
+ public void addParameter(String key, List<String> addValues)
+ {
+
+ if (key == null || addValues == null)
+ {
+ throw new IllegalArgumentException("parameter key and values list cannot be null");
+ }
+
+ List<String> values;
+
+ if (parameters.containsKey(key))
+ {
+ values = parameters.get(key);
+ }
+ else
+ {
+ values = new LinkedList<String>();
+ }
+
+ values.addAll(addValues);
+
+ parameters.put(key, values);
+
+ }
+
+ public void updateFQNParameters(Map toUpdate)
+ {
+
+ Object sysParameters = toUpdate.get(JBOSS_UNIT_PARAMETERS);
+
+ if (sysParameters != null && sysParameters.toString().length() > 0)
+ {
+
+ Map<String,List<String>> parsedParams = parseParameters(sysParameters.toString());
+
+
+ parameters.putAll(parsedParams);
+ }
+
+ for (Object sysPropKey : toUpdate.keySet())
+ {
+ if (sysPropKey.toString().startsWith(JBOSS_UNIT_PARAMETER + "."))
+ {
+ String propertyString = sysPropKey + "=" + toUpdate.get(sysPropKey);
+
+ propertyString = propertyString.replaceFirst(JBOSS_UNIT_PARAMETER + "\\.", "");
+
+
+ //
+ String[] parameter = propertyString.split("=",2);
+
+ //
+ if (parameter.length != 2)
+ {
+ throw new IllegalArgumentException("Property not accepted, it should match a=b and it is " + propertyString);
+ }
+
+
+ List parameterValues = new LinkedList<String>();
+
+ if (parameter[1].matches("\\[.+(,.+)*\\]"))
+ {
+
+
+
+ String valuesString = parameter[1];
+
+ valuesString = valuesString.replaceAll("\\[","").replaceAll("\\]","");
+
+ String[] values = valuesString.split(",");
+
+ for (String value : values)
+ {
+ parameterValues.add(value);
+ }
+
+ }
+ else
+ {
+ parameterValues.add(parameter[1]);
+ }
+
+ if (parameters.containsKey(parameter[0]))
+ {
+ parameters.get(parameter[0]).addAll(parameterValues);
+ }
+ else
+ {
+ parameters.put(parameter[0], parameterValues);
+ }
+ }
+ }
+ }
+
+ private Map<String, List<String>> parseParameters(String parametersString)
+ {
+
+ if (!parametersString.matches("\\[.+=.+(,.+=.+)*\\]"))
+ {
+ throw new IllegalArgumentException("Parameters don't follow proper format: [a=b,c=d,e=f]");
+ }
+
+ Map<String,List<String>> parsedParams = new HashMap<String,List<String>>();
+
+ parametersString = parametersString.replaceAll("\\[","").replaceAll("\\]","");
+
+ String parameterGroups[] = parametersString.split(",");
+
+ for (String parameterGroup : parameterGroups)
+ {
+
+ String parameter[] = parameterGroup.split("=");
+
+ //
+ if (parameter.length != 2)
+ {
+ throw new IllegalArgumentException("Parameter not accepted, it should match a=b and it is " + parameter);
+ }
+
+ List<String> values;
+
+ if (parsedParams.containsKey(parameter[0]))
+ {
+ values = parsedParams.get(parameter[0]);
+ }
+ else
+ {
+ values = new LinkedList<String>();
+ }
+
+ values.add(parameter[1]);
+
+ parsedParams.put(parameter[0], values);
+ }
+
+ return parsedParams;
+
+
+ }
+
+ private String generateArgument(Set<String> values, String argumentName)
+ {
+
+ StringBuffer argument = new StringBuffer(argumentName).append("=");
+ for (String s : values)
+ {
+ argument.append(s).append(",");
+ }
+ // Remove last ','
+ argument.deleteCharAt(argument.length() - 1);
+ return argument.toString();
+ }
+}
Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java (from rev 8938, modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java)
===================================================================
--- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java (rev 0)
+++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/TaskExecutingThread.java 2007-11-15 10:56:16 UTC (rev 8939)
@@ -0,0 +1,50 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.unit.tooling;
+
+import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.Task;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version $Revision: 0.1 $
+ */
+public class TaskExecutingThread extends Thread
+{
+
+ private Task task;
+
+ private TaskExecutingThread()
+ {
+ }
+
+ public TaskExecutingThread(Task task)
+ {
+ this.task = task;
+ }
+
+ public void run()
+ {
+ this.task.execute();
+ }
+}
Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java (from rev 8938, modules/test/trunk/tooling/core/src/main/java/org/jboss/unit/tooling/ToolingConstants.java)
===================================================================
--- modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java (rev 0)
+++ modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ToolingConstants.java 2007-11-15 10:56:16 UTC (rev 8939)
@@ -0,0 +1,71 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.unit.tooling;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version $Revision: 0.1 $
+ */
+public final class ToolingConstants
+{
+
+ public static final String JBOSS_UNIT_PROPERTIES = "jboss.unit.properties";
+
+ public static final String JBOSS_UNIT_PROPERTY = "jboss.unit.property";
+
+ public static final String JBOSS_UNIT_PARAMETER = "jboss.unit.parameter";
+
+ public static final String JBOSS_UNIT_PARAMETERS = "jboss.unit.parameters";
+
+ public static final String OPT_ID = "--id";
+
+ public static final String OPT_IDS = "--ids";
+
+ public static final String OPT_KEYWORDS = "--keywords";
+
+ public static final String OPT_EX_ID = "--ex_id";
+
+ public static final String OPT_EX_IDS = "--ex_ids";
+
+ public static final String OPT_EX_KEYWORDS = "--ex_keywords";
+
+ public static final String OPT_CONFIG = "--config";
+
+ public static final String OPT_SUITE_NAME = "--suite_name";
+
+ public static final String OPT_NO_CONSOLE = "--no_console";
+
+ public static final String OPT_XML_REPORT_DIR = "--xml_report_dir";
+
+ public static final String OPT_HTML_REPORT_DIR = "--html_report_dir";
+
+ public static final String OPT_PROPERTY = "--property";
+
+ public static final String OPT_PROPERTIES = "--properties";
+
+ public static final String OPT_PARAMETER = "--parameter";
+
+ public static final String OPT_PARAMETERS = "--parameters";
+
+
+}
Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/ant (from rev 8938, modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant)
Copied: modules/test/trunk/tooling/src/main/java/org/jboss/unit/tooling/maven2 (from rev 8938, modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2)
Deleted: modules/test/trunk/unit/build.bat
===================================================================
--- modules/test/trunk/unit/build.bat 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/unit/build.bat 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,54 +0,0 @@
-@echo off
-rem
-rem Invokes a script of the same name in the 'tools' module.
-rem
-rem The 'tools' module is expected to be a peer directory of the directory
-rem in which this script lives.
-rem
-rem @author Jason Dillon <jason(a)planet57.com>
-rem
-
-rem $Id: build.bat 1829 2006-03-05 13:20:08Z julien $
-
-setlocal
-
-set PROGNAME=%~nx0
-set DIRNAME=%~dp0
-
-rem Legacy shell support
-if x%PROGNAME%==x set PROGNAME=build.bat
-if x%DIRNAME%==x set DIRNAME=.\
-
-set MODULE_ROOT=%DIRNAME%
-if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
-set TARGET=%TOOLS_ROOT%\bin\build.bat
-set ARGS=%*
-
-rem Start'er up yo
-goto main
-
-:debug
-if not x%DEBUG%==x echo %PROGNAME%: %*
-goto :EOF
-
-:main
-call :debug PROGNAME=%PROGNAME%
-call :debug DIRNAME=%DIRNAME%
-call :debug TOOLS_ROOT=%TOOLS_ROOT%
-call :debug TARGET=%TARGET%
-
-if exist %TARGET% call :call-script & goto :EOF
-rem else fail, we can not go on
-
-echo %PROGNAME%: *ERROR* The target executable does not exist:
-echo %PROGNAME%:
-echo %PROGNAME%: %TARGET%
-echo %PROGNAME%:
-echo %PROGNAME%: Please make sure you have checked out the 'tools' module
-echo %PROGNAME%: and make sure it is up to date.
-goto :EOF
-
-:call-script
-call :debug Executing %TARGET% %ARGS%
-call %TARGET% %ARGS%
-goto :EOF
Deleted: modules/test/trunk/unit/build.sh
===================================================================
--- modules/test/trunk/unit/build.sh 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/unit/build.sh 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,49 +0,0 @@
-#!/bin/sh
-##
-## Invokes a script of the same name in the 'tools' module.
-##
-## The 'tools' module is expected to be a peer directory of the directory
-## in which this script lives.
-##
-## @author Jason Dillon <jason(a)planet57.com>
-##
-
-# $Id: build.sh 1829 2006-03-05 13:20:08Z julien $
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-
-# Buss it yo
-main() {
- if [ "x$TOOLS_ROOT" = "x" ]; then
- TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
- fi
-
- MODULE_ROOT=`cd $DIRNAME; pwd`
- export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
-
- # Where is the target script?
- target="$TOOLS_ROOT/bin/$PROGNAME"
- if [ ! -f "$target" ]; then
- echo "${PROGNAME}: *ERROR* The target executable does not exist:"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: $target"
- echo "${PROGNAME}:"
- echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
- echo "${PROGNAME}: and make sure it is up to date."
- exit 2
- fi
-
- # Get busy yo!
- if [ "x$DEBUG" != "x" ]; then
- echo "${PROGNAME}: Executing: /bin/sh $target $@"
- fi
- if [ "x$TRACE" = "x" ]; then
- exec /bin/sh $target "$@"
- else
- exec /bin/sh -x $target "$@"
- fi
-}
-
-# Lets get ready to rumble!
-main "$@"
Deleted: modules/test/trunk/unit/build.xml
===================================================================
--- modules/test/trunk/unit/build.xml 2007-11-15 08:59:47 UTC (rev 8938)
+++ modules/test/trunk/unit/build.xml 2007-11-15 10:56:16 UTC (rev 8939)
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
- ]>
-
-<!-- $Id: build.xml 7954 2007-08-16 14:51:00Z julien(a)jboss.com $ -->
-
-<!--+======================================================================+-->
-<!--| JBoss Portal (The OpenSource Portal) Build File |-->
-<!--| |-->
-<!--| Distributable under LGPL license. |-->
-<!--| See terms of license at http://www.gnu.org. |-->
-<!--| |-->
-<!--| This file has been designed to work with the 'tools' module and |-->
-<!--| Buildmagic extentions. |-->
-<!--+======================================================================+-->
-
-<project default="main" name="JBoss Portal">
-
- <!--+====================================================================+-->
- <!--| Setup |-->
- <!--| |-->
- <!--| Include the common build elements. |-->
- <!--| |-->
- <!--| This defines several different targets, properties and paths. |-->
- <!--| It also sets up the basic extention tasks amoung other things. |-->
- <!--+====================================================================+-->
-
- &buildmagic;
- &modules;
- &defaults;
- &tools;
- &targets;
-
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
-
- <!--+====================================================================+-->
- <!--| Configuration |-->
- <!--| |-->
- <!--| This target is invoked by the Buildmagic initialization logic |-->
- <!--| and should contain module specific configuration elements. |-->
- <!--+====================================================================+-->
-
- <target name="configure" unless="configure.disable">
-
- <!-- Configure thirdparty libraries -->
- &libraries;
- <path id="library.classpath">
- <path refid="junit.junit.classpath"/>
- </path>
-
- <!-- Configure modules -->
- <call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- </path>
-
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
-
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
- <property name="javadoc.private" value="false"/>
- <property name="javadoc.protected" value="false"/>
- <property name="javadoc.packages" value="org.jboss.unit.*"/>
-
- <!-- Configure defaults & build tools -->
- <call target="configure-defaults"/>
- <call target="configure-tools"/>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Compile |-->
- <!--| |-->
- <!--| This target should depend on other compile-* targets for each |-->
- <!--| different type of compile that needs to be performed, short of |-->
- <!--| documentation compiles. |-->
- <!--+====================================================================+-->
-
- <target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes,
- _default:compile-etc,
- _default:compile-resources">
- <!-- Add module specific elements here. -->
-
-
- <!-- Workaround to include test classes from maven convention -->
-
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- debug="${javac.debug}"
- source="${javac.source}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${maven.module.test.sources}"/>
- <classpath>
- <path refid="javac.classpath"/>
- <pathelement location="${build.classes}"/>
- </classpath>
-
- <include name="${javac.includes}"/>
- </javac>
-
- </target>
-
- <!--+====================================================================+-->
- <!--| Generate Output |-->
- <!--| |-->
- <!--| Generates the target output for this module. Target output is |-->
- <!--| the output which is ment to be released or used by external |-->
- <!--| modules. |-->
- <!--+====================================================================+-->
-
- <target name="output"
- description="Generate all target output."
- depends="compile">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/jboss-unit-lib.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/test/**"/>
- </fileset>
- <fileset dir="${maven.module.resources}"/>
- </jar>
-
- <jar jarfile="${build.lib}/jboss-unit-test.jar">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/unit/**"/>
- </fileset>
- <fileset dir="${maven.module.test.resources}"/>
- </jar>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean" depends="_default:clean">
- <!-- Add module specific elements here. -->
- </target>
-
- <!--+====================================================================+-->
- <!--| Documents |-->
- <!--| |-->
- <!--| Generate all documentation for this module. |-->
- <!--+====================================================================+-->
-
- <target name="docs" depends="_default:docs">
- <!-- Add module specific elements here. -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main" depends="most"/>
- <target name="all" depends="_default:all"/>
- <target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
-
- <target name="test" depends="output">
-
- <java classname="org.jboss.test.unit.AllTests" fork="true">
-<!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
--->
-
- <classpath>
- <path refid="junit.junit.classpath"/>
- <path location="${build.lib}/jboss-unit-lib.jar"/>
- <path location="${build.lib}/jboss-unit-test.jar"/>
- <path location="${build.resources}/test"/>
- </classpath>
- </java>
-
- </target>
-
- <target name="reports" depends="init">
- <junitreport todir="output/tests">
- <fileset dir="output/tests">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="output/tests"/>
- </junitreport>
- </target>
-
-</project>
16 years, 11 months
- 1
- 0